Merge lp:~abreu-alexandre/unity-webapps-qml/cleanup-logs into lp:unity-webapps-qml

[Alexandre Abreu]

Clean up very verbose and non informative logs

Clean up very verbose and non informative logs

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:155
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/179/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-wily-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-webapps-qml-ci/179/rebuild

review: Approve (continuous-integration)

[Justin McPherson (justinmcp)]

review: Approve

[David Barth (dbarth)]

It does clean the logs. I would keep some of the messages as comments in the code though, as some of the cases are not totally obvious when reading the source.

review: Approve

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-04-17 18:57:46 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2015-07-10 17:59:01 +0000
@@ -395,8 +395,6 @@
         if (model) {
             if (model.providesSingleInlineWebapp() && webapps.name.length === 0) {
                 webapps.name = model.getSingleInlineWebappName();
-
-                console.log('Webapp name updated to ' + webapps.name)
             }
             __setupNamedWebappEnvironment();
         }

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2015-01-08 19:36:38 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js	2015-07-10 17:59:01 +0000
@@ -79,7 +79,6 @@
             var script = userScriptUrls[i];
             if (this._injectedUserScripts.some(
                         function(e) { return e === script; })) {
-                console.log('Skipping already injected script: ' + script)
                 continue;
             }
 

=== modified file 'src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js'
--- src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js	2014-07-18 13:43:55 +0000
+++ src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js	2015-07-10 17:59:01 +0000
@@ -126,13 +126,6 @@
                     console.log('Error while dispatching callback call: ' + e)
                 }
             }
-            else {
-                try {
-                    console.log('Unknown message received: '
-                                + JSON.stringify(message));
-                }
-                catch(e) {}
-            }
         });
     },
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp	2014-03-31 20:00:56 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp	2015-07-10 17:59:01 +0000
@@ -121,8 +121,6 @@
         desktopId = QString("%1.desktop").arg(QString(qgetenv("APP_ID")));
     }
 
-    qDebug() << "UnityWebapps initialized with desktop id: " << desktopId;
-
     bool success = initInternal(name,
                                 displayName,
                                 domain,
@@ -174,7 +172,6 @@
 {
     if (_appInfos != NULL)
     {
-        qDebug() << "WARNING: Found existing application info for app " << name;
         return;
     }
 
@@ -225,14 +222,12 @@
 
     if ( ! _model->exists(displayName))
     {
-        qDebug() << "Initializing a non-local webapp (not found installed locally)";
         return true;
     }
 
     QString modelAppDomain = _model->getDomainFor(displayName);
     if (modelAppDomain.isEmpty())
     {
-        qDebug() << "Validation a weird webapps install: domain name empty for " << displayName;
         return true;
     }
 
@@ -246,7 +241,6 @@
             QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
     if (userhomeList.isEmpty())
     {
-        qDebug() << "Error cannot find current '~'";
         return QString();
     }
 
@@ -442,8 +436,6 @@
     if (qgetenv("UNITY_WEBAPPS_QML_GLOBAL_DESKTOP_FILE_LOCATION").data() != NULL)
     {
         DESKTOP_FILE_LOCATION = QString(qgetenv("UNITY_WEBAPPS_QML_GLOBAL_DESKTOP_FILE_LOCATION"));
-
-        qDebug() << "Using " << DESKTOP_FILE_LOCATION << " as a global desktop file location search path";
     }
 
     QFileInfo fileInfo(QString("%1/%2")
@@ -570,7 +562,6 @@
     QString shareDirPath (getUserSharePath());
     if (shareDirPath.isEmpty())
     {
-        qDebug() << "Error while trying to get current session home directory";
         return;
     }
 

=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2015-01-08 19:36:38 +0000
+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp	2015-07-10 17:59:01 +0000
@@ -127,7 +127,6 @@
 
     if (path.isEmpty())
     {
-        qDebug() << "Empty path in webapps model search path update request";
         return;
     }
 
@@ -142,10 +141,6 @@
 
     _searchPath = doCorrectSearchPath(searchDir.path());
 
-    qDebug() << "Using '"
-             << _searchPath
-             << "' as the default search path for installed webapps";
-
     Q_EMIT searchPathChanged(_searchPath);
 }
 
@@ -261,7 +256,6 @@
 
     if (!isValidInstall(installationSearchPath))
     {
-        qDebug() << "Invalid webapps installation";
         return;
     }
 
@@ -289,8 +283,6 @@
                 parser.parse (QFileInfo (webappInfos.value().manifestFilename));
         if (!manifest.isvalid())
         {
-            qDebug() << "Invalid webapps manifest found in: "
-                     << candidateWebappFolder.absoluteFilePath();
             continue;
         }