Debug logging refactoring.

Drivers config save


Former-commit-id: 348d96cf

plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java

@@ -28,6 +28,7 @@ import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPreferenceConstants;
 import org.eclipse.ui.PlatformUI;
+import org.jkiss.dbeaver.Log;
 import org.jkiss.dbeaver.core.DBeaverCore;
 
 import java.io.File;
@@ -38,7 +39,7 @@ import java.net.URL;
  */
 public class DBeaverApplication implements IApplication
 {
-
+    static final Log log = Log.getLog(DBeaverApplication.class);
     public static final String DBEAVER_DEFAULT_DIR = ".dbeaver"; //$NON-NLS-1$
 
     /* (non-Javadoc)
@@ -95,9 +96,9 @@ public class DBeaverApplication implements IApplication
         }
 
         DBeaverCore.setStandalone(true);
-        System.out.println(DBeaverCore.getProductTitle() + " is starting"); //$NON-NLS-1$
-        System.out.println("Install path: '" + Platform.getInstallLocation().getURL() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
-        System.out.println("Instance path: '" + instanceLoc.getURL() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+        log.debug(DBeaverCore.getProductTitle() + " is starting"); //$NON-NLS-1$
+        log.debug("Install path: '" + Platform.getInstallLocation().getURL() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
+        log.debug("Instance path: '" + instanceLoc.getURL() + "'"); //$NON-NLS-1$ //$NON-NLS-2$
 
         PlatformUI.getPreferenceStore().setDefault(
             IWorkbenchPreferenceConstants.KEY_CONFIGURATION_ID,
@@ -133,7 +134,7 @@ public class DBeaverApplication implements IApplication
     @Override
     public void stop()
     {
-        System.out.println("DBeaver is stopping"); //$NON-NLS-1$
+        log.debug("DBeaver is stopping"); //$NON-NLS-1$
         final IWorkbench workbench = PlatformUI.getWorkbench();
         if (workbench == null)
             return;

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/core/DBeaverCore.java

@@ -167,7 +167,7 @@ public class DBeaverCore implements DBPApplication {
     private void initialize()
     {
         long startTime = System.currentTimeMillis();
-        System.out.println("Initialize Core...");
+        log.debug("Initialize Core...");
         // Register properties adapter
         this.workspace = ResourcesPlugin.getWorkspace();
 
@@ -202,7 +202,7 @@ public class DBeaverCore implements DBPApplication {
                 log.error("Error activating plugin service", e);
             }
         }
-        System.out.println("Core initialized (" + (System.currentTimeMillis() - startTime) + "ms)");
+        log.debug("Core initialized (" + (System.currentTimeMillis() - startTime) + "ms)");
     }
 
     private void initializeProjects()
@@ -242,7 +242,7 @@ public class DBeaverCore implements DBPApplication {
     public synchronized void dispose()
     {
         long startTime = System.currentTimeMillis();
-        System.out.println("Shutdown Core...");
+        log.debug("Shutdown Core...");
 
         DBeaverCore.setClosing(true);
 
@@ -304,7 +304,7 @@ public class DBeaverCore implements DBPApplication {
         DBeaverCore.instance = null;
         DBeaverCore.disposed = true;
 
-        System.out.println("Shutdown completed in " + (System.currentTimeMillis() - startTime) + "ms");
+        log.debug("Shutdown completed in " + (System.currentTimeMillis() - startTime) + "ms");
     }
 
     @Override

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/RuntimeUtils.java

@@ -279,47 +279,40 @@ public class RuntimeUtils {
     }
 
     public static URLConnection openConnection(String urlString) throws IOException {
-System.out.print("Open [" + urlString + "]...");
+
         log.debug("Open [" + urlString + "]");
 
-        final URLConnection connection;
-        try {
-            DBPPreferenceStore prefs = DBeaverCore.getGlobalPreferenceStore();
-            String proxyHost = prefs.getString(DBeaverPreferences.UI_PROXY_HOST);
-            Proxy proxy = null;
-            if (!CommonUtils.isEmpty(proxyHost)) {
-                int proxyPort = prefs.getInt(DBeaverPreferences.UI_PROXY_PORT);
-                if (proxyPort <= 0) {
-                    log.warn("Invalid proxy port: " + proxyPort);
-                }
-                proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+        DBPPreferenceStore prefs = DBeaverCore.getGlobalPreferenceStore();
+        String proxyHost = prefs.getString(DBeaverPreferences.UI_PROXY_HOST);
+        Proxy proxy = null;
+        if (!CommonUtils.isEmpty(proxyHost)) {
+            int proxyPort = prefs.getInt(DBeaverPreferences.UI_PROXY_PORT);
+            if (proxyPort <= 0) {
+                log.warn("Invalid proxy port: " + proxyPort);
             }
+            proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyHost, proxyPort));
+        }
 
-            URL url = new URL(urlString);
-            connection = (proxy == null ? url.openConnection() : url.openConnection(proxy));
-            connection.setReadTimeout(10000);
-            connection.setConnectTimeout(10000);
-            if (connection instanceof HttpURLConnection) {
-                final HttpURLConnection httpConnection = (HttpURLConnection) connection;
-                httpConnection.setRequestMethod("GET"); //$NON-NLS-1$
-                httpConnection.setInstanceFollowRedirects(true);
-                connection.setRequestProperty(
-                    "User-Agent",  //$NON-NLS-1$
-                    DBeaverCore.getProductTitle());
-            }
-            connection.connect();
-            if (connection instanceof HttpURLConnection) {
-                final HttpURLConnection httpConnection = (HttpURLConnection) connection;
-                if (httpConnection.getResponseCode() != 200) {
-                    throw new IOException("File not found '" + urlString + "': " + httpConnection.getResponseMessage());
-                }
+        URL url = new URL(urlString);
+        final URLConnection connection = (proxy == null ? url.openConnection() : url.openConnection(proxy));
+        connection.setReadTimeout(10000);
+        connection.setConnectTimeout(10000);
+        if (connection instanceof HttpURLConnection) {
+            final HttpURLConnection httpConnection = (HttpURLConnection) connection;
+            httpConnection.setRequestMethod("GET"); //$NON-NLS-1$
+            httpConnection.setInstanceFollowRedirects(true);
+            connection.setRequestProperty(
+                "User-Agent",  //$NON-NLS-1$
+                DBeaverCore.getProductTitle());
+        }
+        connection.connect();
+        if (connection instanceof HttpURLConnection) {
+            final HttpURLConnection httpConnection = (HttpURLConnection) connection;
+            if (httpConnection.getResponseCode() != 200) {
+                throw new IOException("File not found '" + urlString + "': " + httpConnection.getResponseMessage());
             }
-        } catch (IOException e) {
-            System.out.println("Failed.");
-            throw e;
         }
 
-        System.out.println("Ok.");
         return connection;
     }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadAutoPage.java

@@ -329,6 +329,7 @@ class DriverDownloadAutoPage extends DriverDownloadPage {
 
         try {
             runnableContext.run(true, true, new LibraryDownloader());
+            getWizard().getDriver().setModified(true);
             DataSourceProviderRegistry.getInstance().saveDrivers();
         } catch (InvocationTargetException e) {
             UIUtils.showErrorDialog(getShell(), "Driver download", "Error downloading driver files", e.getTargetException());

plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/Log.java

@@ -23,6 +23,7 @@ import org.jkiss.dbeaver.bundle.ModelActivator;
 import org.jkiss.dbeaver.utils.GeneralUtils;
 
 import java.io.PrintStream;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 
 /**
@@ -32,8 +33,10 @@ public class Log
 {
     private static String corePluginID = ModelPreferences.PLUGIN_ID;
 
+    private static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-hh HH:mm:ss.SSS");
+    private static final ILog eclipseLog = ModelActivator.getInstance().getLog();
+
     private final String name;
-    private final ILog eclipseLog;
 
     public static Log getLog(Class<?> forClass) {
         return new Log(forClass.getName());
@@ -41,7 +44,6 @@ public class Log
 
     private Log(String name)
     {
-        eclipseLog = ModelActivator.getInstance().getLog();
         this.name = name;
     }
 
@@ -100,23 +102,21 @@ public class Log
     public void debug(Object message, Throwable t)
     {
         ModelActivator activator = ModelActivator.getInstance();
-        PrintStream debugWriter;
-        if (activator == null) {
-            debugWriter = System.err;
-        } else {
-            debugWriter = activator.getDebugWriter();
+        debugMessage(message, t, System.err);
+        if (activator != null) {
+            debugMessage(message, t, activator.getDebugWriter());
         }
-        if (debugWriter != null) {
-            synchronized (Log.class) {
-                debugWriter.print(new Date().toString());
-                debugWriter.print(" - "); //$NON-NLS-1$
-                if (t == null) {
-                    debugWriter.println(message);
-                } else {
-                    t.printStackTrace(debugWriter);
-                }
-                debugWriter.flush();
+    }
+
+    private void debugMessage(Object message, Throwable t, PrintStream debugWriter) {
+        synchronized (Log.class) {
+            debugWriter.print(sdf.format(new Date()) + " - ");
+            if (t == null) {
+                debugWriter.println(message);
+            } else {
+                t.printStackTrace(debugWriter);
             }
+            debugWriter.flush();
         }
     }