logging

firepick1 · Mar 7, 2016 · df385d9 · df385d9
1 parent ca525c5
commit df385d9
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 36 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@ FireSight
 node-v*
 node
 npm
+logs
 *.log
 *.class
 *.wiki

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 firenodejs
 ----------
 
+0.18.1
+------
+* NEW: Save firenodejs log files in logs
+
 0.18.0
 ------
 * NEW: DeltaMesh dual z-plane scans (required for z-calibration)

diff --git a/js/firestep/driver.js b/js/firestep/driver.js
@@ -79,7 +79,7 @@ try {
                 that.firestep_proc.stdout.on('data', function(buffer) {
                     var data = buffer.toString();
                     data = data.substr(0, data.length - 1); // chop LF to match serialport
-                    //console.log("TTY\t: firestep stdout:" + data);
+                    //console.log("TTY \t: firestep stdout:" + data);
                     that.onSerialData(data);
                 });
                 that.firestep_proc.stderr.on('data', function(data) {
@@ -92,11 +92,11 @@ try {
             Logger.start("FireStepDriver(" + that.model.rest.serialPath + ") " + cmd);
             var child1 = child_process.exec(cmd, function(error, stdout, stdin) {
                 if (error instanceof Error) {
-                    console.log("TTY\t: FireStepDriver(" + that.model.rest.serialPath + ") attempt #1:" + error);
+                    console.log("TTY \t: FireStepDriver(" + that.model.rest.serialPath + ") attempt #1:" + error);
                     var child2 = child_process.exec(cmd, function(error, stdout, stdin) {
                         if (error instanceof Error) {
                             reset_serialDriver(that);
-                            console.log("TTY\t: FireStepDriver(" + that.model.rest.serialPath + ") RETRY #1:" + error);
+                            console.log("TTY \t: FireStepDriver(" + that.model.rest.serialPath + ") RETRY #1:" + error);
                         } else {
                             onOpenSuccess(that, stdout, 2);
                         }
@@ -106,7 +106,7 @@ try {
                 }
             });
         } catch (e) {
-            console.log("TTY\t: FireStepDriver(" + that.model.rest.serialPath + ") UNAVAILABLE:" + e);
+            console.log("TTY \t: FireStepDriver(" + that.model.rest.serialPath + ") UNAVAILABLE:" + e);
             reset_serialDriver(that);
         }
     }
@@ -181,7 +181,7 @@ try {
     FireStepDriver.prototype.write = function(cmd) {
         var that = this;
         that.model.writes++;
-        console.log("TTY\t: WRITE(" + that.model.writes + ") " + cmd + "\\n");
+        console.log("TTY \t: WRITE(" + that.model.writes + ") " + cmd + "\\n");
         try {
             if (that.serial) {
                 that.serial.write(cmd);
@@ -197,7 +197,7 @@ try {
                             that.firestep_proc.stdin.write("\n");
                         } else {
                             // FireStep spawn failed
-                            console.log("TTY\t: firestep response TIMEOUT:" + that.msLaunchTimeout + "ms");
+                            console.log("TTY \t: firestep response TIMEOUT:" + that.msLaunchTimeout + "ms");
                             reset_serialDriver(that);
                         }
                     }, that.msLaunchTimeout);
@@ -206,19 +206,19 @@ try {
                 throw new Error("no serial driver");
             }
         } catch (e) {
-            console.log("TTY\t: FireStepDriver(" + that.model.rest.serialPath + ") UNAVAILABLE:" + e);
+            console.log("TTY \t: FireStepDriver(" + that.model.rest.serialPath + ") UNAVAILABLE:" + e);
             reset_serialDriver(that);
         }
     }
     FireStepDriver.prototype.processQueue = function() {
         var that = this;
         if (that.serialQueue.length <= 0) {
-            //console.log("TTY\t: FireStepDriver.processQueue(empty) ");
+            //console.log("TTY \t: FireStepDriver.processQueue(empty) ");
         } else if (!that.model.available) {
-            console.log("TTY\t: FireStepDriver.processQueue(unavailable) ", that.serialQueue.length,
+            console.log("TTY \t: FireStepDriver.processQueue(unavailable) ", that.serialQueue.length,
                 " items");
         } else if (that.serialInProgress) {
-            //console.log("TTY\t: FireStepDriver.processQueue(busy) ", that.serialQueue.length, " items");
+            //console.log("TTY \t: FireStepDriver.processQueue(busy) ", that.serialQueue.length, " items");
         } else {
             that.serialInProgress = true;
             var jcmd = that.serialQueue.shift();
@@ -231,7 +231,7 @@ try {
     FireStepDriver.prototype.onSerialData = function(data) {
         var that = this;
         that.model.reads++;
-        console.log("TTY\t: READ(" + that.model.reads + ") " + data + "\\n");
+        console.log("TTY \t: READ(" + that.model.reads + ") " + data + "\\n");
         if (typeof data !== 'string') {
             throw new Error("expected Javascript string for serial data return");
         }
@@ -244,8 +244,8 @@ try {
             that.handlers.response(response);
             request.resp = response;
             if (response.s < 0) {
-                console.log("TTY\t: FireStep COMMAND FAILED:" + data);
-                console.log("TTY\t: FireStepDriver() COMMAND QUEUE CLEARED " + that.serialQueue.length + " ITEMS");
+                console.log("TTY \t: FireStep COMMAND FAILED:" + data);
+                console.log("TTY \t: FireStepDriver() COMMAND QUEUE CLEARED " + that.serialQueue.length + " ITEMS");
                 that.serialQueue = [];
             }
         }
@@ -255,7 +255,7 @@ try {
             try {
                 request.onDone && request.onDone(request.resp);
             } catch (e) {
-                console.log("TTY\t: ERROR(response handler failed):" + data, e);
+                console.log("TTY \t: ERROR(response handler failed):" + data, e);
             }
             that.processQueue();
             if (that.serialQueue.length == 0) {

diff --git a/js/firestep/mock-driver.js b/js/firestep/mock-driver.js
@@ -17,7 +17,7 @@ function mockAsync(callback) {
     var mockSerial = function(that, cmd) { // CANNOT BLOCK!!!
         that.model.writes = that.model.writes ? that.model.writes + 1 : 1;
         var serialData = JSON.stringify(cmd);
-        console.log("TTY\t: WRITE(" + that.model.writes + ") " + serialData + "\\n");
+        console.log("TTY \t: WRITE(" + that.model.writes + ") " + serialData + "\\n");
 
         // SEND SERIAL DATA HERE
 
@@ -138,10 +138,10 @@ function mockAsync(callback) {
         };
         that.handlers = {
             idle: function() {
-                //    console.log("TTY\t: idle");
+                //    console.log("TTY \t: idle");
             },
             response: function(response) {
-                //   console.log("TTY\t: response(" + JSON.stringify(response) + ")");
+                //   console.log("TTY \t: response(" + JSON.stringify(response) + ")");
             },
         };
 

diff --git a/js/firestep/planner.js b/js/firestep/planner.js
@@ -326,7 +326,7 @@ var MockFPD = require("./mock-fpd");
         if (!onDone) {
             onDone = function(data) {
                 if (data.s) {
-                    console.log("TTY\t: FireStepPlanner: FireStep response:" + data.s);
+                    console.log("TTY \t: FireStepPlanner: FireStep response:" + data.s);
                 }
             }
         }
@@ -347,7 +347,7 @@ var MockFPD = require("./mock-fpd");
         }
         that.driver.processQueue();
         if (that.driver.queueLength()) {
-            console.log("TTY\t: FireStepPlanner.send() queued:", that.driver.queueLength());
+            console.log("TTY \t: FireStepPlanner.send() queued:", that.driver.queueLength());
         }
         return that;
     }
@@ -396,7 +396,7 @@ var MockFPD = require("./mock-fpd");
                 log: "FireStepPlanner.onIdle(initialized)"
             });
         } else {
-            that.verbose && console.log("TTY\t: FireStepPlanner.onIdle(waiting) ...");
+            that.verbose && console.log("TTY \t: FireStepPlanner.onIdle(waiting) ...");
         }
         if (that.mpoPlan) {
             that.model.mpo = that.model.mpo || {};

diff --git a/js/firestep/service.js b/js/firestep/service.js
@@ -136,7 +136,7 @@ function millis() {
         }
         that.send(cmd, function(data) {
             var msElapsed = millis() - msStart;
-            console.log("TTY\t: FireStepService.test(dvs) msElapsed:", msElapsed);
+            console.log("TTY \t: FireStepService.test(dvs) msElapsed:", msElapsed);
         });
         that.send(that.cmd_mpo(), function(data) {
             var msElapsed = millis() - msStart;

diff --git a/js/firestep/tinyg-driver.js b/js/firestep/tinyg-driver.js
@@ -16,7 +16,7 @@ function mockAsync(callback) {
     var mockSerial = function(that, cmd) { // CANNOT BLOCK!!!
         that.model.writes = that.model.writes ? that.model.writes + 1 : 1;
         var serialData = JSON.stringify(cmd);
-        console.log("TTY\t: WRITE(" + that.model.writes + ") " + serialData + "\\n");
+        console.log("TTY \t: WRITE(" + that.model.writes + ") " + serialData + "\\n");
 
         // SEND SERIAL DATA HERE
         if (cmd.hasOwnProperty("id")) { // identify machine
@@ -112,10 +112,10 @@ function mockAsync(callback) {
         };
         that.handlers = {
             idle: function() {
-                //    console.log("TTY\t: idle");
+                //    console.log("TTY \t: idle");
             },
             response: function(response) {
-                //   console.log("TTY\t: response(" + JSON.stringify(response) + ")");
+                //   console.log("TTY \t: response(" + JSON.stringify(response) + ")");
             },
         };
 
@@ -194,7 +194,7 @@ function mockAsync(callback) {
             console.log("Config changed: " + util.inspect(changed));
         });
 
-        console.log("TTY\t: tinyg-driver: opened serial connection to:" + that.model.rest.serialPath);
+        console.log("TTY \t: tinyg-driver: opened serial connection to:" + that.model.rest.serialPath);
 
         // MAKE IT WORK OR THROW
         that.model.driver = that.name;
@@ -222,12 +222,12 @@ function mockAsync(callback) {
         var that = this;
 
         if (that.serialQueue.length <= 0) {
-            //console.log("TTY\t: TinyGDriver.processQueue(empty) ");
+            //console.log("TTY \t: TinyGDriver.processQueue(empty) ");
         } else if (!that.model.available) {
-            //console.log("TTY\t: TinyGDriver.processQueue(unavailable) ", that.serialQueue.length, " items");
+            //console.log("TTY \t: TinyGDriver.processQueue(unavailable) ", that.serialQueue.length, " items");
             //console.log(that.serialQueue);
         } else if (that.serialInProgress) {
-            //console.log("TTY\t: TinyGDriver.processQueue(busy) ", that.serialQueue.length, " items");
+            //console.log("TTY \t: TinyGDriver.processQueue(busy) ", that.serialQueue.length, " items");
             //console.log(that.serialQueue);
         } else {
             that.serialInProgress = true;
@@ -240,7 +240,7 @@ function mockAsync(callback) {
     TinyGDriver.prototype.onSerialData = function(data) {
         var that = this;
         that.model.reads = that.model.reads ? that.model.reads + 1 : 1;
-        console.log("TTY\t: READ(" + that.model.reads + ") " + data + "\\n");
+        console.log("TTY \t: READ(" + that.model.reads + ") " + data + "\\n");
         var parsed = JSON.parse(data);
         var retData = parsed;
 

diff --git a/js/server.js b/js/server.js
@@ -32,7 +32,7 @@ var options = {
     version: {
         major: 0,
         minor: 18,
-        patch: 0,
+        patch: 1,
     },
 };
 

diff --git a/scripts/startup.sh b/scripts/startup.sh
@@ -3,11 +3,14 @@
 scripts/shutdown.sh
 
 pushd $(dirname "$0")/.. > /dev/null
-rm -f firenodejs.log
-echo -e "START\t: `pwd`/$0\t`date`" | tee -a firenodejs.log
+mkdir -p logs
+LOGNAME=logs/firenodejs`date +%F-%H%M`.log
+ln -sf $LOGNAME firenodejs.log
+echo -e "START\t: `pwd`/$0\t`date`" | tee $LOGNAME
+echo -e "INFO\t: logging to $LOGNAME" | tee -a $LOGNAME
 echo -e "INFO\t: launching firenodejs server daemon as user:`whoami`" | tee -a firenodejs.log
-nohup ./node js/server.js $@ 0<&- &>> firenodejs.log &
+nohup ./node js/server.js $@ 0<&- &>> $LOGNAME &
 popd > /dev/null
-echo -e "END\t: `pwd`/$0\t`date`" | tee -a firenodejs.log
+echo -e "END \t: `pwd`/$0\t`date`" | tee -a $LOGNAME
 
 exit 0
diff --git a/www/js/shared/Logger.js b/www/js/shared/Logger.js
@@ -132,7 +132,7 @@ var should = require("should");
         logLevel: "warn"
     });
     Logger.start = function(msg) {
-        Logger.logger.write("START+" + (new Date() - msLaunch) + "ms\t: " + Logger.logger.message(arguments));
+        Logger.logger.write("T+" + (new Date() - msLaunch) + "\t: " + Logger.logger.message(arguments));
     }
     Logger.validate = function(value) {
         should.exist(value);
@@ -145,7 +145,7 @@ var should = require("should");
         value.setLevel.should.be.a.function;
     }
     Logger.msLaunch = function() {
-        return "T+" + (new Date() - msLaunch) + "ms";
+        return "+" + (new Date() - msLaunch);
     }
 
     module.exports = exports.Logger = Logger;
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,7 @@ FireSight @@
     node-v*
     node
     npm
+    logs
     *.log
     *.class
     *.wiki
@@ Expand Down @@