[Title] Added some debug logs for OnDemandInstall

[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/DebugTool.java b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/DebugTool.java
index 7d60a1d..c184ef0 100644 (file)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/DebugTool.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/DebugTool.java
@@ -95,4 +95,9 @@ public class DebugTool {
     public String getPackagetype() {
         return packagetype;
     }
+
+    @Override
+    public String toString() {
+        return packagename + "," + packagetype + "," + architecture;
+    }
 }

diff --git a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
index f116c7a..196db7b 100644 (file)
--- a/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
+++ b/org.tizen.common.connection/src/org/tizen/common/connection/debugtools/OnDemandInstall.java
@@ -212,20 +212,13 @@ public class OnDemandInstall {
 
         for (DebugTool dt : debugTools) {
             // get package list to install
-            monitor.worked(15);
+            verbose("Verifying: " + dt);
             if (verifyArchitecture(dt.getArchitecture()) == false) {
                 continue;
             }
 
             if (isInstalled(dt) == true) {
-                continue;
-            }
-
-            String local = TOOLS_HOST_PATH + "/" + dt.getSourcepath() + "/" + dt.getBinaryname();
-            String remote = TizenPlatformConstants.TOOLS_TARGET_PATH + "/" + dt.getBinaryname();
-
-            if (copyPackage(local, remote) == false) {
-                Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_COPY_FILE, dt.getBinaryname()));
+                verbose("Verifying failed (already installed): " + dt);
                 continue;
             }
 
@@ -240,6 +233,7 @@ public class OnDemandInstall {
         String cmd = "";
         String result = "";
 
+        verbose("Deploying: " + tool);
         if (copyPackage(local, remote) == false) {
             Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_COPY_FILE, tool.getBinaryname()));
             return;
@@ -254,12 +248,17 @@ public class OnDemandInstall {
             result = getResult(cmd);
             if (CMD_RESULT_SUCCESS.equals(result) == false) {
                 Logger.error(NLS.bind(OnDemandInstallMessages.CANNOT_INSTALL_TOOL, tool.getPackagename(), result));
+            } else {
+                verbose("Deployed: " + tool);
             }
         } catch (Exception e) {
             Logger.error(NLS.bind(OnDemandInstallMessages.ERROR_EXECUTE_COMMAND, cmd), e);
         }
     }
 
+    private void verbose(String message) {
+        Logger.info("[OnDemandInstall][" + Thread.currentThread().getId() + "] " + message);
+    }
 
     class OnDemandRunnable implements Runnable {
         IProgressMonitor monitor = null;
@@ -285,46 +284,37 @@ public class OnDemandInstall {
     }
 
     private static class OnDemandNullProgressMonitor implements IProgressMonitor {
-
         @Override
         public void beginTask(String name, int totalWork) {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public void done() {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public void internalWorked(double work) {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public boolean isCanceled() {
-            // TODO Auto-generated method stub
             return false;
         }
 
         @Override
         public void setCanceled(boolean value) {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public void setTaskName(String name) {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public void subTask(String name) {
-            // TODO Auto-generated method stub
         }
 
         @Override
         public void worked(int work) {
-            // TODO Auto-generated method stub
         }
     }