Fix logging bug

- Remove typeError in global_loghandler
- Apply regex for logs in admin panel

4 files changed, 6 insertions, 5 deletions

diff --git a/date.txt b/date.txt
index 79cacdc..d808b62 100644
--- a/date.txt
+++ b/date.txt
@@ -1 +1 @@
-Fri May 26 14:56:51 IST 2017
+Tue Jun  6 18:04:57 IST 2017
diff --git a/experiment/views.py b/experiment/views.py
index e4ab2ab..3ea5a8d 100644
--- a/experiment/views.py
+++ b/experiment/views.py
@@ -60,7 +60,7 @@ def initiation(req):
                         settings.boards[key]["experiment_id"] = e.id
                         global_logfile = settings.SBHS_GLOBAL_LOG_DIR + "/" + key + ".log"
                         with open(global_logfile, "a") as global_loghandler:
-                            data = "\n\n===================New experiment====================\nUsername :", user.username, "\nExperiment Id :", e.id, "\n"
+                            data = "\n\n===================New experiment====================\nUsername : " + user.username + "\nExperiment Id : " + str(e.id) + "\n"
                             global_loghandler.write(data)
                             
                         reset(req)
@@ -204,7 +204,7 @@ def log_data(sbhs, mid, experiment_id, heat=None, fan=None, temp=None):
     if temp is None:
         temp = sbhs.getTemp()
 
-    data = "%s %s %s %s\n" % (datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), str(heat), str(fan), str(temp))
+    data = "%f %s %s %s\n" % (time.time(), str(heat), str(fan), str(temp))
     experiment_logfile = Experiment.objects.get(id=experiment_id).log
     global_logfile = settings.SBHS_GLOBAL_LOG_DIR + "/" + str(mid) + ".log"
     with open(global_logfile, "a") as global_loghandler, open(experiment_logfile, "a") as experiment_loghandler:
diff --git a/map_machine_ids.txt b/map_machine_ids.txt
index d586cb4..659395e 100644
--- a/map_machine_ids.txt
+++ b/map_machine_ids.txt
@@ -1 +1,2 @@
-52=/dev/ttyUSB0
+15=/dev/ttyUSB1
+7=/dev/ttyUSB0
diff --git a/templates/admin/testexp.html b/templates/admin/testexp.html
index f857902..d9cbce9 100644
--- a/templates/admin/testexp.html
+++ b/templates/admin/testexp.html
@@ -214,7 +214,7 @@
             if (data.status_code == 200) {
                 console.log(data.message.logs.replace("/\n/g", "<br/>"));
                 document.getElementById("username").innerHTML = "User : " + data.message.user;
-                document.getElementById("log-data").innerHTML = "<pre>Date Time Heater Fan Temp</pre>" + data.message.logs.replace(new RegExp("\n","g"), "<br/>");
+                document.getElementById("log-data").innerHTML = "<pre>Timestamp Heater Fan Temp</pre>" + data.message.logs.replace(new RegExp("\n","g"), "<br/>");
             }
             else {
                 alert(data.status_code);