Исправлена ошибка, из-за которой программа падала на некорректном (без разделителей...

[weathermon.git] / weathermon.lua

diff --git a/weathermon.lua b/weathermon.lua
index 20f5aca9fa194d32e9a1b9d128dfa65d86a43ffc..d1917c1c4ef203be8bef441b79a362ad4bbafb51 100755 (executable)
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -10,16 +10,74 @@ function getConfig()
   web_user = cur.get(config,"web","user")
   web_pass = cur.get(config,"web","password")
   web_devid = cur.get(config,"web","devid")
   web_user = cur.get(config,"web","user")
   web_pass = cur.get(config,"web","password")
   web_devid = cur.get(config,"web","devid")

+
+  web_iface = cur.get(config,"web","iface")
+
+  if web_iface then

   
   

-  io.input("/sys/class/net/eth0/address")
-  mac = io.read("*line")
-  mac = mac:gsub(":","")
-  mac = mac:upper()
+    command = '/sbin/ifconfig '..web_iface..' | grep \'\\<inet\\>\' | sed -n \'1p\' | tr -s \' \' | cut -d \' \' -f3 | cut -d \':\' -f2'
+    f=io.popen(command,'r')
+    ip_addr=f:read()
+  
+  end

 
 

-  web_devid = web_devid or mac
+  if not web_devid then
+  
+    if web_iface then
+      io.input("/sys/class/net/"..web_iface.."/address")
+    else
+      io.input("/sys/class/net/eth0/address")
+    end
+
+    mac = io.read("*line")
+    mac = mac:gsub(":","")
+    mac = mac:upper()
+
+    web_devid = mac
+
+  end

 
   logging = cur.get(config,"logging","enabled") 
 
 
   logging = cur.get(config,"logging","enabled") 
 

+  serial_port = cur.get(config,"serial","port")
+  serial_baud = cur.get(config,"serial","baud")
+
+  input_file = cur.get(config,"input","file")
+  input_exec = cur.get(config,"input","exec")
+  alarm_exec = cur.get(config,"alarm","exec")
+
+  if serial_port then
+
+    command = "stty -F  "..serial_port.." "..serial_baud
+    os.execute(command)
+
+  end
+
+  mqtt_host = cur.get(config,"mqtt","host")
+  mqtt_port = cur.get(config,"mqtt","port")
+  mqtt_id = cur.get(config,"mqtt","id")
+  mqtt_topic = cur.get(config,"mqtt","topic")
+  mqtt_alarm_topic = cur.get(config,"mqtt","alarm_topic")
+
+  mqtt_user = cur.get(config,"mqtt","user")
+  mqtt_passwd = cur.get(config,"mqtt","password")
+
+  if mqtt_host and not mqtt_id then
+    mqtt_id="weather-"..web_devid
+  end
+
+  if mqtt_host and not mqtt_port then
+    mqtt_port = 1883
+  end
+
+  if mqtt_host and not mqtt_topic then
+    mqtt_topic = 'weathermon/{dev}/{type}/{id}/{param}'
+  end
+
+  if mqtt_host and not mqtt_alarm_topic then
+    mqtt_alarm_topic = 'alarm/{dev}/{type}/{id}'
+  end
+

 end
 
 require "socket"
 end
 
 require "socket"


@@ -59,31 +117,30 @@ end
 
 function submitValue(type,id,param,val)
 
 
 function submitValue(type,id,param,val)
 

-  printLog("URL="..web_url)
-

   url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
 
   url = web_url.."?stype="..type.."&sid="..id.."&param="..param.."&value="..val
 

-  printLog(url)
-

   command = "curl"
 
   command = "curl"
 

+  if web_iface then
+    command = command.." --interface "..ip_addr
+  end
+

   if web_user then
     command = command.." -u "..web_user..":"..web_pass
   end
 
   command = command.." \""..url.."\""
 
   if web_user then
     command = command.." -u "..web_user..":"..web_pass
   end
 
   command = command.." \""..url.."\""
 

-  printLog("COMMAND=\""..command.."\"")

   os.execute(command)
   os.execute(command)

-  print("")
+  print()

 
 end
 
 function processLine(str)
 
   msg=splitStr(line,':')
 
 end
 
 function processLine(str)
 
   msg=splitStr(line,':')

-  msg_type=msg[1] or nil
-  msg_body=msg[2] or nil
+  msg_type=msg[1] or ''
+  msg_body=msg[2] or ''

   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then
   if msg_type=="STATUS" then
     printLog("Status: "..msg_body)
   elseif msg_type=="ERROR" then


@@ -97,8 +154,8 @@ function processLine(str)
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')
     sensor_id = web_devid
     for i,rec in ipairs(sens) do
       recrd=splitStr(rec,'=')

-      key=recrd[1] or nil
-      value=recrd[2] or nil
+      key=recrd[1] or ''
+      value=recrd[2] or ''

       if value then
         if key=="TYPE" then
           sensor_type=value
       if value then
         if key=="TYPE" then
           sensor_type=value


@@ -110,8 +167,67 @@ function processLine(str)
       end
     end
     for k,v in pairs(sensor) do
       end
     end
     for k,v in pairs(sensor) do

-      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..key..", Value = "..value)
-      submitValue(sensor_type,sensor_id,key,value)
+      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+      submitValue(sensor_type,sensor_id,k,v)
+      if mqtt_client then
+        mqtt_path=string.gsub(mqtt_topic,"{(.-)}", 
+          function (name) 
+            if name=="dev" then
+              return web_devid
+            elseif name=="type" then
+              return sensor_type
+            elseif name=="id" then
+              return sensor_id
+            elseif name=="param" then
+              return k
+            else
+              return '{'..name..'}'
+            end      
+          end)
+        mqtt_client:publish(mqtt_path,v)
+      end  
+    end
+  elseif msg_type=="ALARM" then
+    printLog("ALARM: "..msg_body)  
+    sens = splitStr(msg_body,",")
+    sensor = {}
+    idx = 1
+    sensor_type = nil
+    sensor_id = web_devid
+    mqtt_param = {}
+    for i,rec in ipairs(sens) do
+      recrd=splitStr(rec,'=')
+      key=recrd[1] or ''
+      value=recrd[2] or ''
+      if value then
+        if key=="TYPE" then
+          alarm_type=value
+        elseif key=="ID" then
+          alarm_id=value
+        end
+      end
+    end
+    if mqtt_client then
+      mqtt_path=string.gsub(mqtt_alarm_topic,"{(.-)}", 
+        function (name) 
+          if name=="dev" then
+            return web_devid
+          elseif name=="type" then
+            return sensor_type
+          elseif name=="id" then
+            return sensor_id
+          else
+            return '{'..name..'}'
+          end      
+        end)
+      mqtt_client:publish(mqtt_path,msg_body)
+    end
+    if alarm_exec then
+      command=alarm_exec..
+        " \""..string.gsub(alarm_type,"\"","\\\"")..
+        "\" \""..string.gsub(alarm_id,"\"","\\\"")..
+        "\" \""..string.gsub(msg_body,"\"","\\\"").."\""
+      os.execute(command)

     end
   end
 
     end
   end
 


@@ -119,6 +235,30 @@ end
 
 getConfig()
 
 
 getConfig()
 

-line=arg[1]
-print(line)
-processLine(line)
+if mqtt_host then
+  MQTT = require "paho.mqtt"
+  mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)
+  if mqtt_user then
+    mqtt_client:auth(mqtt_user, mqtt_passwd)
+  end
+  mqtt_client:connect(mqtt_id)
+  json = require( "json" )
+end
+
+if serial_port then
+  serialin=io.open(serial_port,"r")
+elseif input_file == "-" then
+  serialin=io.stdin;
+elseif input_file then
+  serialin=io.open(input_file,"r")
+elseif input_exec then
+  serialin=io.popen(input_exec,"r")
+else
+  printLog("No input selected")
+  return
+end  
+while 1 do
+  line=serialin:read()
+  print(line)
+  processLine(line)
+end