Skip to content

Commit

Permalink
Reworked logger to handle objects passed to it.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nigeljohnson73
nigeljohnson73 committed Jul 14, 2020
1 parent 6df3c2a commit f3ea31f
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion js/app.nocr.js
View file

Large diffs are not rendered by default.

17 changes: 10 additions & 7 deletions js/app.nopack.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,13 @@ colorLuminance = function(hex, lum) {
};

logger = function(l, err) {
if (typeof l == "object")
return logObj(l, err);

if (!err)
err = "inf";

//msg = moment().format("YYYY-MM-DD HH:mm:ss") + "| " + l;
// msg = moment().format("YYYY-MM-DD HH:mm:ss") + "| " + l;
msg = moment().format("HH:mm:ss") + "| " + l;
if (err == "dbg") {
console.debug(msg);
Expand Down Expand Up @@ -678,7 +681,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
}

logger("apiSvc.call('" + api + "')", "dbg");
logObj(logtxdata, "dbg");
logger(logtxdata, "dbg");

// Send it all over to the server
$http({
Expand All @@ -705,7 +708,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
ldata.success = false;
ldata.status = "error";
ldata.message = "";
logObj(ldata, "wrn");
logger(ldata, "wrn");
}

if (typeof notify == "function") {
Expand All @@ -732,7 +735,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
ldata.success = false;
ldata.status = "error";
ldata.message = "";
// logObj(ldata, "wrn");
// logger(ldata, "wrn");

logger("apiSvc.call(): calling notifier", "dbg");
notify(ldata);
Expand Down Expand Up @@ -839,7 +842,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
var getEnv = function() {
apiSvc.call("getEnv", {}, function(data) {
logger("HomeCtrl::handleGetEnv()", "dbg");
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
// Save the env data first so it can be used everywhere else
$scope.env = data.env;
Expand Down Expand Up @@ -903,7 +906,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
var getSnapshotImage = function() {
apiSvc.queue("getSnapshotImage", {}, function(data) {
logger("HomeCtrl::handleGetSnapshotImage()", "dbg");
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
$scope.camshot = data.camshot;
} else {
Expand All @@ -930,7 +933,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
};
}, function(data) {
logger(o.api + "(): Data transfer: " + d.prettyEnd());
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
o.success(data);
} else {
Expand Down
2 changes: 1 addition & 1 deletion js/app.packed.js
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions js/raw/_controllers/HomeCtrl.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
var getEnv = function() {
apiSvc.call("getEnv", {}, function(data) {
logger("HomeCtrl::handleGetEnv()", "dbg");
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
// Save the env data first so it can be used everywhere else
$scope.env = data.env;
Expand Down Expand Up @@ -145,7 +145,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
var getSnapshotImage = function() {
apiSvc.queue("getSnapshotImage", {}, function(data) {
logger("HomeCtrl::handleGetSnapshotImage()", "dbg");
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
$scope.camshot = data.camshot;
} else {
Expand All @@ -172,7 +172,7 @@ app.controller('HomeCtrl', [ "$scope", "$timeout", "$interval", "apiSvc", functi
};
}, function(data) {
logger(o.api + "(): Data transfer: " + d.prettyEnd());
logObj(data, "dbg");
logger(data, "dbg");
if (data.success) {
o.success(data);
} else {
Expand Down
6 changes: 3 additions & 3 deletions js/raw/_services/apiSvc.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
}

logger("apiSvc.call('" + api + "')", "dbg");
logObj(logtxdata, "dbg");
logger(logtxdata, "dbg");

// Send it all over to the server
$http({
Expand All @@ -110,7 +110,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
ldata.success = false;
ldata.status = "error";
ldata.message = "";
logObj(ldata, "wrn");
logger(ldata, "wrn");
}

if (typeof notify == "function") {
Expand All @@ -137,7 +137,7 @@ app.service('apiSvc', [ "$http", "$timeout", "$interval", function($http, $timeo
ldata.success = false;
ldata.status = "error";
ldata.message = "";
// logObj(ldata, "wrn");
// logger(ldata, "wrn");

logger("apiSvc.call(): calling notifier", "dbg");
notify(ldata);
Expand Down
5 changes: 4 additions & 1 deletion js/raw/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,13 @@ colorLuminance = function(hex, lum) {
};

logger = function(l, err) {
if (typeof l == "object")
return logObj(l, err);

if (!err)
err = "inf";

//msg = moment().format("YYYY-MM-DD HH:mm:ss") + "| " + l;
// msg = moment().format("YYYY-MM-DD HH:mm:ss") + "| " + l;
msg = moment().format("HH:mm:ss") + "| " + l;
if (err == "dbg") {
console.debug(msg);
Expand Down

0 comments on commit f3ea31f

Please sign in to comment.