Author: smaisonneuve Date: 2015-05-22 14:09:17 +0000 (Fri, 22 May 2015) New Revision: 1438 Url: http://forge.nuiton.org/projects/sandbox/repository/revisions/1438 Log: [Logger] - adding loglevel library to replace console.log Modified: wit/js/services/UserActivityService.js wit/package.json Modified: wit/js/services/UserActivityService.js =================================================================== --- wit/js/services/UserActivityService.js 2015-05-22 14:07:13 UTC (rev 1437) +++ wit/js/services/UserActivityService.js 2015-05-22 14:09:17 UTC (rev 1438) @@ -1,12 +1,13 @@ "use strict"; -var x11 = require('x11'); -var xprop = require('xprop'); -var moment = require('moment'); +var x11 = require("x11"); +var xprop = require("xprop"); +var moment = require("moment"); +var log = require("loglevel"); var db = require("./database.js"); var config = require("./ConfigurationService.js"); -var events = require('events'); +var events = require("events"); var eventEmitter = new events.EventEmitter(); var crtSession; @@ -49,7 +50,7 @@ xClient.GetProperty(0, ev.wid, ev.atom, xClient.atoms.WINDOW, 0, 4, function(err, prop) { if (err || !prop.data.length) { - console.log("Couldn't retrieve active window property"); + log.warn("Couldn't retrieve active window property"); reject(); } else { @@ -59,7 +60,7 @@ resolve(wid); } else { - console.log("Couldn't retrieve active window property"); + log.warn("Couldn't retrieve active window property"); reject(); } } @@ -81,7 +82,7 @@ xprop({prop:'_NET_WM_NAME', id:windowId}, function(err, properties) { if (err) { - console.log("Couldn't retrieve window name for id :", windowId); + log.warn("Couldn't retrieve window name for id :", windowId); reject(); } else { @@ -210,7 +211,7 @@ var rst; if (!startDate || !endDate) { - console.error("[UserActivityService] getSessions : parameter missing !"); + log.error("[UserActivityService] getSessions : parameter missing !"); } else { var d1 = moment(startDate), d2 = moment(endDate); Modified: wit/package.json =================================================================== --- wit/package.json 2015-05-22 14:07:13 UTC (rev 1437) +++ wit/package.json 2015-05-22 14:09:17 UTC (rev 1438) @@ -33,7 +33,8 @@ "react-router": "^0.13.2", "x11": "^1.0.3", "xprop": "^0.0.0", - "nonce":"^1.0.3" + "nonce":"^1.0.3", + "loglevel": "^1.2.0" }, "devDependencies": { "grunt": "^0.4.5",