Add timestamps to console and file

RogerHardiman · Apr 27, 2017 · d8f2ed0 · d8f2ed0
1 parent ca1220a
commit d8f2ed0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 17 deletions.
diff --git a/read_serial_port.js b/read_serial_port.js
@@ -134,12 +134,15 @@ port.on('open', function(err) {
 // Callback - Data
 port.on('data', function(buffer) {
 
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + 'Rx' + BufferToHexString(buffer) + '\r\n';
+
     // write to console
-    if (args.verbose) process.stdout.write(BufferToHexString(buffer));
+    if (args.verbose) console.log(msg);
 
     // write to log file if 'fd' is not undefined
     if (log_fd) {
-      var msg = 'Rx' + BufferToHexString(buffer) + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });
@@ -158,12 +161,16 @@ port.on('disconnect', function(err) {
 
 // Callback - Dedoded protocol
 pelco_d_decoder.on('log', function(message) {
+
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + '=>' + message + '\r\n';
+
     // show on console
-    console.log(message);
+    console.log(msg);
 
     // Write to file
     if (log_fd) {
-      var msg = '=>' + message + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });
@@ -173,12 +180,16 @@ pelco_d_decoder.on('log', function(message) {
 
 try{
   extra_decoder_1.on('log', function(message) {
+
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + '=>' + message + '\r\n';
+
     // show on console
-    console.log(message);
+    console.log(msg);
 
     // Write to file
     if (log_fd) {
-      var msg = '=>' + message + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });

diff --git a/read_socket.js b/read_socket.js
@@ -43,11 +43,6 @@ if (args.list || (!args.port)) {
   return;
 }
 
-
-
-// Defaults 2400 8-N-1
-var port = '9000';
-
 // Log File
 var log_fd;
 
@@ -86,12 +81,15 @@ var server = new net.createServer(function(sock) {
   // Callback - Data
   sock.on('data', function(buffer) {
 
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + 'Rx' + BufferToHexString(buffer) + '\r\n';
+
     // write to console
-    if (args.verbose) process.stdout.write(BufferToHexString(buffer));
+    if (args.verbose) console.log(msg);
 
     // write to log file if 'fd' is not undefined
     if (log_fd) {
-      var msg = 'Rx' + BufferToHexString(buffer) + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });
@@ -118,12 +116,16 @@ server.listen(port,'127.0.0.1');
 
 // Callback - Dedoded protocol
 pelco_d_decoder.on('log', function(message) {
+
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + '=>' + message + '\r\n';
+
     // show on console
-    console.log(message);
+    console.log(msg);
 
     // Write to file
     if (log_fd) {
-      var msg = '=>' + message + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });
@@ -133,12 +135,16 @@ pelco_d_decoder.on('log', function(message) {
 
 try{
   extra_decoder_1.on('log', function(message) {
+
+    var now = dateTime.create();
+    var nowString = now.format('H:M:S.N');
+    var msg = nowString + '=>' + message + '\r\n';
+
     // show on console
-    console.log(message);
+    console.log(msg);
 
     // Write to file
     if (log_fd) {
-      var msg = '=>' + message + '\r\n';
       fs.write(log_fd,msg,function(err) {
         if (err) console.log('Error writing to file');
       });