Отключение буферизации штатными средствами lua.

[weathermon.git] / bin / weathermon

diff --git a/bin/weathermon b/bin/weathermon
index 03fad42630200d77a989ee62d40f395aee07f183..b8be15fbc785941f9b2a77421adbb13b64b9245e 100755 (executable)
--- a/bin/weathermon
+++ b/bin/weathermon
@@ -118,7 +118,9 @@ end
 
 function submitValue(type,id,param,val)
 
 
 function submitValue(type,id,param,val)
 

-  if web_url then
+  val = tonumber(val)
+
+  if web_url and val then

 
     local url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)
 
 
     local url = web_url.."?stype="..url_encode(type).."&sid="..url_encode(id).."&param="..url_encode(param).."&value="..url_encode(val)
 


@@ -133,8 +135,8 @@ function submitValue(type,id,param,val)
         return req_sock
       end})
 
         return req_sock
       end})
 

-    if code ~= 200 then
-      print("writing record to backlog...")
+    if code ~= 200 and backlog_con then
+      printLog("writing record to backlog...")

       backlog_con:execute(string.format("INSERT INTO queue(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))
     end
 
       backlog_con:execute(string.format("INSERT INTO queue(time_stamp,sensor_id,sensor,param,value) VALUES (datetime('now','localtime'),'%s','%s','%s',%f)",id,type,param,val))
     end
 


@@ -385,24 +387,33 @@ else
   return
 end  
 
   return
 end  
 

+serialin:setvbuf('no')
+

 records = {}
 
 while 1 do
 records = {}
 
 while 1 do

+

   line=serialin:read("*l")
   line=serialin:read("*l")

+

   if line == nil then
     break
   end
   if line == nil then
     break
   end

-  printLog("Received: "..line);
-  if startswith(line,'{') then
-    processJson(line)
-  else
-    processLine(line)
-  end

 
 

-  if dump_file then
-    local f = io.open(dump_file,"w")
-    io.output(f)
-    io.write(json.encode(records))
-    io.close(f)
-  end
+  pcall(function ()
+  
+    printLog("Received: "..line)
+    if startswith(line,'{') then
+      processJson(line)
+    else
+      processLine(line)
+    end
+
+    if dump_file then
+      local f = io.open(dump_file,"w")
+      io.output(f)
+      io.write(json.encode(records))
+      io.close(f)
+    end
+  end)
+    

 end
 end