提交 ee6645b8 编写于 作者: S Serge Rider

Core logging fix (init debug log after it was configured in DBeaverApplication)


Former-commit-id: 45915eee
上级 50401cd6
...@@ -160,7 +160,7 @@ public class DBeaverApplication extends BaseApplicationImpl { ...@@ -160,7 +160,7 @@ public class DBeaverApplication extends BaseApplicationImpl {
{ {
String defaultHomePath = getDefaultInstanceLocation(); String defaultHomePath = getDefaultInstanceLocation();
if (DBeaverCommandLine.handleCommandLine(commandLine, defaultHomePath)) { if (DBeaverCommandLine.handleCommandLine(commandLine, defaultHomePath)) {
log.debug("Commands processed. Exit " + GeneralUtils.getProductName() + "."); System.err.println("Commands processed. Exit " + GeneralUtils.getProductName() + ".");
return IApplication.EXIT_OK; return IApplication.EXIT_OK;
} }
} }
...@@ -196,14 +196,14 @@ public class DBeaverApplication extends BaseApplicationImpl { ...@@ -196,14 +196,14 @@ public class DBeaverApplication extends BaseApplicationImpl {
headlessMode = false; headlessMode = false;
} }
initDebugWriter();
updateSplashHandler(); updateSplashHandler();
final Runtime runtime = Runtime.getRuntime(); final Runtime runtime = Runtime.getRuntime();
// Init Core plugin and mark it as standalone version // Init Core plugin and mark it as standalone version
initDebugWriter();
log.debug(GeneralUtils.getProductName() + " " + GeneralUtils.getProductVersion() + " is starting"); //$NON-NLS-1$ log.debug(GeneralUtils.getProductName() + " " + GeneralUtils.getProductVersion() + " is starting"); //$NON-NLS-1$
log.debug("OS: " + System.getProperty(StandardConstants.ENV_OS_NAME) + " " + System.getProperty(StandardConstants.ENV_OS_VERSION) + " (" + System.getProperty(StandardConstants.ENV_OS_ARCH) + ")"); log.debug("OS: " + System.getProperty(StandardConstants.ENV_OS_NAME) + " " + System.getProperty(StandardConstants.ENV_OS_VERSION) + " (" + System.getProperty(StandardConstants.ENV_OS_ARCH) + ")");
log.debug("Java version: " + System.getProperty(StandardConstants.ENV_JAVA_VERSION) + " by " + System.getProperty(StandardConstants.ENV_JAVA_VENDOR) + " (" + System.getProperty(StandardConstants.ENV_JAVA_ARCH) + "bit)"); log.debug("Java version: " + System.getProperty(StandardConstants.ENV_JAVA_VERSION) + " by " + System.getProperty(StandardConstants.ENV_JAVA_VENDOR) + " (" + System.getProperty(StandardConstants.ENV_JAVA_ARCH) + "bit)");
......
...@@ -32,7 +32,6 @@ public class CoreApplicationActivator extends AbstractUIPlugin { ...@@ -32,7 +32,6 @@ public class CoreApplicationActivator extends AbstractUIPlugin {
// The plug-in ID // The plug-in ID
public static final String PLUGIN_ID = "org.jkiss.dbeaver.core.application"; public static final String PLUGIN_ID = "org.jkiss.dbeaver.core.application";
private static final Log log = Log.getLog(CoreApplicationActivator.class);
// The shared instance // The shared instance
private static CoreApplicationActivator plugin; private static CoreApplicationActivator plugin;
...@@ -71,7 +70,7 @@ public class CoreApplicationActivator extends AbstractUIPlugin { ...@@ -71,7 +70,7 @@ public class CoreApplicationActivator extends AbstractUIPlugin {
} }
} }
if (message != null) { if (message != null) {
log.debug(message); System.err.println(message);
} }
}, null); }, null);
//context.addBundleListener(new BundleLoadListener()); //context.addBundleListener(new BundleLoadListener());
......
...@@ -53,7 +53,7 @@ public class Log ...@@ -53,7 +53,7 @@ public class Log
private final String name; private final String name;
private static ThreadLocal<PrintWriter> logWriter = new ThreadLocal<>(); private static ThreadLocal<PrintWriter> logWriter = new ThreadLocal<>();
private static boolean quietMode; private static boolean quietMode;
private static final PrintWriter DEFAULT_DEBUG_WRITER = new PrintWriter(System.err);; private static PrintWriter DEFAULT_DEBUG_WRITER;
public static Log getLog(Class<?> forClass) { public static Log getLog(Class<?> forClass) {
return new Log(forClass.getName()); return new Log(forClass.getName());
...@@ -175,11 +175,15 @@ public class Log ...@@ -175,11 +175,15 @@ public class Log
private void debugMessage(Object message, Throwable t) { private void debugMessage(Object message, Throwable t) {
PrintWriter logStream = logWriter.get(); PrintWriter logStream = logWriter.get();
PrintWriter debugWriter = logStream != null ? logStream : (quietMode ? null : DEFAULT_DEBUG_WRITER);
if (debugWriter == null) {
return;
}
synchronized (Log.class) { synchronized (Log.class) {
if (DEFAULT_DEBUG_WRITER == null) {
DEFAULT_DEBUG_WRITER = new PrintWriter(System.err, true);
}
PrintWriter debugWriter = logStream != null ? logStream : (quietMode ? null : DEFAULT_DEBUG_WRITER);
if (debugWriter == null) {
return;
}
debugWriter.print(sdf.format(new Date()) + " - "); //$NON-NLS-1$ debugWriter.print(sdf.format(new Date()) + " - "); //$NON-NLS-1$
if (message != null) { if (message != null) {
debugWriter.println(message); debugWriter.println(message);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册