Merge lp:~justinmcp/unity-webapps-qml/logging into lp:unity-webapps-qml

[Justin McPherson]

- Enable display of logging information from the webbrowser app.
- Hide integration logging messages in the intergration category.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/105/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/53/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/53/console

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

review: Needs Fixing (continuous-integration)

[lp:~justinmcp/unity-webapps-qml/logging]

105. By Justin McPherson on 2014-04-02

merge with trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:105
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/106/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/54
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/54

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

review: Approve (continuous-integration)

[lp:~justinmcp/unity-webapps-qml/logging]

106. By Justin McPherson on 2014-04-08

merge from trunk

107. By Justin McPherson on 2014-04-08

merge from trunk

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:107
http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-ci/112/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-amd64-ci/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-webapps-qml-trusty-armhf-ci/60

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

review: Approve (continuous-integration)

Unmerged revisions

107. By Justin McPherson on 2014-04-08

merge from trunk

106. By Justin McPherson on 2014-04-08

merge from trunk

105. By Justin McPherson on 2014-04-02

merge with trunk

104. By Justin McPherson on 2014-04-01

Changes to logging.

- Rename property to loggingCategories
- Make dynamic

103. By Justin McPherson on 2014-03-31

Enable conditional logging.

Based on an array of strings. Each string represents the type of logging of
interest.

102. By Justin McPherson on 2014-03-31

Allow webapp logging through Unity.

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.js'
--- src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-03-18 18:52:11 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.js	2014-04-11 07:20:27 +0000
@@ -37,11 +37,11 @@
      * \param userscriptContent
      */
     function _UnityWebApps(parentItem, bindeeProxies, backends, userscripts) {
+        this._parent = parentItem;
         this._injected_unity_api_path = Qt.resolvedUrl('unity-webapps-api.js');
         this._bindeeProxies = bindeeProxies;
         this._backends = backends;
         this._userscripts = userscripts || [];
-
         this._bind();
     };
 
@@ -247,10 +247,14 @@
          *
          */
         _log: function (msg) {
-            try {
-                console.debug(msg);
+            if (this._parent.loggingCategories !== undefined && this._parent.loggingCategories.length > 0) {
+                if (this._parent.loggingCategories.indexOf('integration') !== -1) {
+                    try {
+                        console.debug(msg);
+                    }
+                    catch(e) {}
+                }
             }
-            catch(e) {}
         },
 
         /**

=== modified file 'src/Ubuntu/UnityWebApps/UnityWebApps.qml'
--- src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/UnityWebApps.qml	2014-04-11 07:20:27 +0000
@@ -144,6 +144,12 @@
      */
     property var _opt_backendProxies: null
 
+    /*!
+      \qmlproperty var UnityWebApps::loggingCategories
+
+      An array of strings indicating logging types that should be enabled.
+     */
+    property var loggingCategories: []
 
     Settings {
         id: settings
@@ -742,6 +748,24 @@
                     }
                 },
                 __actionNames: {}
+            },
+
+            Logger: {
+                info: function (strings) {
+                    if (loggingCategories.length > 0 && loggingCategories.indexOf('web_console') !== -1) {
+                        console.log("LOG: " + strings);
+                    }
+                },
+                warning: function (strings) {
+                    if (loggingCategories.length > 0 && loggingCategories.indexOf('web_console') !== -1) {
+                        console.warn("WARNING: " + strings);
+                    }
+                },
+                error: function (strings) {
+                    if (loggingCategories.length > 0 && loggingCategories.indexOf('web_console') !== -1) {
+                        console.error("ERROR: " + strings);
+                    }
+                }
             }
         };
     }

=== modified file 'src/Ubuntu/UnityWebApps/unity-webapps-api.js.in'
--- src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-03-26 15:52:46 +0000
+++ src/Ubuntu/UnityWebApps/unity-webapps-api.js.in	2014-04-11 07:20:27 +0000
@@ -282,6 +282,11 @@
             AlarmApi: createAlarmApi(backend),
             ContentHub: createContentHubApi(backend),
             RuntimeApi: createRuntimeApi(backend),
+            Logger: {
+                info: createArgumentsSanitizer (backend, [{ str: true }], 'Logger.info'),
+                warning: createArgumentsSanitizer (backend, [{ str: true }], 'Logger.warning'),
+                error: createArgumentsSanitizer (backend, [{ str: true }], 'Logger.error')
+            },
         };
 
         return api;