diff options
| author | Omair Majid <omajid@redhat.com> | 2010-11-18 11:12:10 -0500 |
|---|---|---|
| committer | Omair Majid <omajid@redhat.com> | 2010-11-18 11:12:10 -0500 |
| commit | 3f351c0718209878b0a3d880d9757ddca90e447e (patch) | |
| tree | 14b93db2b7f2159f57c0ac127be72a52848099c0 /netx/net/sourceforge/jnlp/runtime | |
| parent | 16d8875dca7ef93f6c1aea72cf84bb8bb5251722 (diff) | |
integrate configurable logging
2010-11-18 Omair Majid <omajid@redhat.com>
* netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java:
Add KEY_ENABLE_LOGGING.
(loadDefaultProperties): Use KEY_ENABLE_LOGGING.
* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java: Add
redirectStreams, STDERR_FILE and STDOUT_FILE.
(initialize): Call initializeStreams.
(initializeStreams): New method. Redirects or duplicates stdout and
stderr to the logging files as required.
(setRedirectStreams): New method. Sets whether stdout/stderr streams
should be redirected.
* plugin/icedteanp/java/sun/applet/PluginMain.java:
(PluginMain): Move code for creating logging files into JNLPRuntime.
Call JNLPRuntime.setRedirectStreams to redirect streams.
(TeeOutputStream): Move to its own class.
* netx/net/sourceforge/jnlp/util/TeeOutputStream.java: Moved from
PluginMain into this new class.
Diffstat (limited to 'netx/net/sourceforge/jnlp/runtime')
| -rw-r--r-- | netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java | 4 | ||||
| -rw-r--r-- | netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java | 47 |
2 files changed, 50 insertions, 1 deletions
diff --git a/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java b/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java index 8a83602..20d66e0 100644 --- a/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java +++ b/netx/net/sourceforge/jnlp/runtime/DeploymentConfiguration.java @@ -154,6 +154,8 @@ public final class DeploymentConfiguration { public static final String KEY_SYSTEM_TRUSTED_JSSE_CERTS = "deployment.system.security.trusted.jssecerts"; public static final String KEY_SYSTEM_TRUSTED_CLIENT_CERTS = "deployment.system.security.trusted.clientautcerts"; + public static final String KEY_ENABLE_LOGGING = "deployment.log"; + public static final String KEY_CREATE_DESKTOP_SHORTCUT = "deployment.javaws.shortcut"; public static final String KEY_BROWSER_PATH = "deployment.browser.path"; @@ -375,7 +377,7 @@ public final class DeploymentConfiguration { { "deployment.console.startup.mode", CONSOLE_HIDE }, /* tracing and logging */ { "deployment.trace", String.valueOf(false) }, - { "deployment.log", String.valueOf(false) }, + { KEY_ENABLE_LOGGING, String.valueOf(false) }, /* JNLP association */ { "deployment.javaws.associations", String.valueOf(JNLP_ASSOCIATION_ASK_USER) }, /* desktop integration */ diff --git a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java index 2e6aee2..4575334 100644 --- a/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java +++ b/netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java @@ -107,6 +107,9 @@ public class JNLPRuntime { /** whether debug mode is on */ private static boolean debug = false; // package access by Boot + /** whether streams should be redirected */ + private static boolean redirectStreams = false; + /** mutex to wait on, for initialization */ public static Object initMutex = new Object(); @@ -119,6 +122,9 @@ public class JNLPRuntime { /** contains the arguments passed to the jnlp runtime */ private static List<String> initialArguments; + public static final String STDERR_FILE = "java.stderr"; + public static final String STDOUT_FILE = "java.stdout"; + /** Username */ public static final String USER = System.getProperty("user.name"); @@ -183,6 +189,8 @@ public class JNLPRuntime { } } + initializeStreams(); + isWebstartApplication = isApplication; //Setting the system property for javawebstart's version. @@ -281,6 +289,34 @@ public class JNLPRuntime { } /** + * Initializes the standard output and error streams, redirecting them or + * duplicating them as required. + */ + private static void initializeStreams() { + Boolean enableLogging = Boolean.valueOf(config + .getProperty(DeploymentConfiguration.KEY_ENABLE_LOGGING)); + if (redirectStreams || enableLogging) { + String logDir = config.getProperty(DeploymentConfiguration.KEY_USER_LOG_DIR); + File errFile = new File(logDir, JNLPRuntime.STDERR_FILE); + errFile.getParentFile().mkdirs(); + File outFile = new File(logDir, JNLPRuntime.STDOUT_FILE); + outFile.getParentFile().mkdirs(); + + try { + if (redirectStreams) { + System.setErr(new PrintStream(new FileOutputStream(errFile))); + System.setOut(new PrintStream(new FileOutputStream(outFile))); + } else { + System.setErr(new TeeOutputStream(new FileOutputStream(errFile), System.err)); + System.setOut(new TeeOutputStream(new FileOutputStream(outFile), System.out)); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + /** * Gets the Configuration associated with this runtime * @return a {@link DeploymentConfiguration} object that can be queried to * find relevant configuration settings @@ -490,6 +526,17 @@ public class JNLPRuntime { } /** + * Sets whether the standard output/error streams should be redirected to + * the loggging files. + * + * @throws IllegalStateException if the runtime has already been initialized + */ + public static void setRedirectStreams(boolean redirect) { + checkInitialized(); + redirectStreams = redirect; + } + + /** * Sets the default update policy. * * @throws IllegalStateException if caller is not the exit class |