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

Proposed by Alexandre Abreu on 2015-07-10
Status: Merged
Approved by: Alexandre Abreu on 2015-09-14
Approved revision: 155
Merged at revision: 155
Proposed branch: lp:~abreu-alexandre/unity-webapps-qml/cleanup-logs
Merge into: lp:unity-webapps-qml
Diff against target: 142 lines (+0/-27)
5 files modified
src/Ubuntu/UnityWebApps/UnityWebApps.qml (+0/-2)
src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js (+0/-1)
src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js (+0/-7)
src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp (+0/-9)
src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp (+0/-8)
To merge this branch: bzr merge lp:~abreu-alexandre/unity-webapps-qml/cleanup-logs
Reviewer Review Type Date Requested Status
David Barth (community) Approve on 2015-07-16
Justin McPherson 2015-07-10 Approve on 2015-07-13
PS Jenkins bot (community) continuous-integration Approve on 2015-07-10
Review via email: mp+264444@code.launchpad.net

Commit message

Clean up very verbose and non informative logs

Description of the change

Clean up very verbose and non informative logs

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
review: Approve
David Barth (dbarth) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
2--- src/Ubuntu/UnityWebApps/UnityWebApps.qml 2015-04-17 18:57:46 +0000
3+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml 2015-07-10 17:59:01 +0000
4@@ -395,8 +395,6 @@
5 if (model) {
6 if (model.providesSingleInlineWebapp() && webapps.name.length === 0) {
7 webapps.name = model.getSingleInlineWebappName();
8-
9- console.log('Webapp name updated to ' + webapps.name)
10 }
11 __setupNamedWebappEnvironment();
12 }
13
14=== modified file 'src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js'
15--- src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js 2015-01-08 19:36:38 +0000
16+++ src/Ubuntu/UnityWebApps/UnityWebAppsUtils.js 2015-07-10 17:59:01 +0000
17@@ -79,7 +79,6 @@
18 var script = userScriptUrls[i];
19 if (this._injectedUserScripts.some(
20 function(e) { return e === script; })) {
21- console.log('Skipping already injected script: ' + script)
22 continue;
23 }
24
25
26=== modified file 'src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js'
27--- src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js 2014-07-18 13:43:55 +0000
28+++ src/Ubuntu/UnityWebApps/common/js/unity-binding-bridge.js 2015-07-10 17:59:01 +0000
29@@ -126,13 +126,6 @@
30 console.log('Error while dispatching callback call: ' + e)
31 }
32 }
33- else {
34- try {
35- console.log('Unknown message received: '
36- + JSON.stringify(message));
37- }
38- catch(e) {}
39- }
40 });
41 },
42
43
44=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp'
45--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp 2014-03-31 20:00:56 +0000
46+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-api.cpp 2015-07-10 17:59:01 +0000
47@@ -121,8 +121,6 @@
48 desktopId = QString("%1.desktop").arg(QString(qgetenv("APP_ID")));
49 }
50
51- qDebug() << "UnityWebapps initialized with desktop id: " << desktopId;
52-
53 bool success = initInternal(name,
54 displayName,
55 domain,
56@@ -174,7 +172,6 @@
57 {
58 if (_appInfos != NULL)
59 {
60- qDebug() << "WARNING: Found existing application info for app " << name;
61 return;
62 }
63
64@@ -225,14 +222,12 @@
65
66 if ( ! _model->exists(displayName))
67 {
68- qDebug() << "Initializing a non-local webapp (not found installed locally)";
69 return true;
70 }
71
72 QString modelAppDomain = _model->getDomainFor(displayName);
73 if (modelAppDomain.isEmpty())
74 {
75- qDebug() << "Validation a weird webapps install: domain name empty for " << displayName;
76 return true;
77 }
78
79@@ -246,7 +241,6 @@
80 QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
81 if (userhomeList.isEmpty())
82 {
83- qDebug() << "Error cannot find current '~'";
84 return QString();
85 }
86
87@@ -442,8 +436,6 @@
88 if (qgetenv("UNITY_WEBAPPS_QML_GLOBAL_DESKTOP_FILE_LOCATION").data() != NULL)
89 {
90 DESKTOP_FILE_LOCATION = QString(qgetenv("UNITY_WEBAPPS_QML_GLOBAL_DESKTOP_FILE_LOCATION"));
91-
92- qDebug() << "Using " << DESKTOP_FILE_LOCATION << " as a global desktop file location search path";
93 }
94
95 QFileInfo fileInfo(QString("%1/%2")
96@@ -570,7 +562,6 @@
97 QString shareDirPath (getUserSharePath());
98 if (shareDirPath.isEmpty())
99 {
100- qDebug() << "Error while trying to get current session home directory";
101 return;
102 }
103
104
105=== modified file 'src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp'
106--- src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp 2015-01-08 19:36:38 +0000
107+++ src/Ubuntu/UnityWebApps/plugin/unity-webapps-app-model.cpp 2015-07-10 17:59:01 +0000
108@@ -127,7 +127,6 @@
109
110 if (path.isEmpty())
111 {
112- qDebug() << "Empty path in webapps model search path update request";
113 return;
114 }
115
116@@ -142,10 +141,6 @@
117
118 _searchPath = doCorrectSearchPath(searchDir.path());
119
120- qDebug() << "Using '"
121- << _searchPath
122- << "' as the default search path for installed webapps";
123-
124 Q_EMIT searchPathChanged(_searchPath);
125 }
126
127@@ -261,7 +256,6 @@
128
129 if (!isValidInstall(installationSearchPath))
130 {
131- qDebug() << "Invalid webapps installation";
132 return;
133 }
134
135@@ -289,8 +283,6 @@
136 parser.parse (QFileInfo (webappInfos.value().manifestFilename));
137 if (!manifest.isvalid())
138 {
139- qDebug() << "Invalid webapps manifest found in: "
140- << candidateWebappFolder.absoluteFilePath();
141 continue;
142 }
143

Subscribers

People subscribed via source and target branches

to all changes: