From 7192c0159c43233ece751755524dfe7b5c340dfd Mon Sep 17 00:00:00 2001 From: Roman Bazalevsky Date: Thu, 15 Sep 2016 14:59:16 +0300 Subject: [PATCH 1/1] =?utf8?q?1)=20=D0=9F=D0=BE=D0=B4=D0=B4=D0=B5=D1=80?= =?utf8?q?=D0=B6=D0=BA=D0=B0=20=D1=81=D0=B8=D0=B3=D0=BD=D0=B0=D0=BB=D0=B8?= =?utf8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8=20=D0=BD=D0=B0=20433=D0=9C=D0=93?= =?utf8?q?=D1=86.=202)=20=D0=9E=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB=D0=B5?= =?utf8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D1=81=D1=85=D0=BE=D0=B4=D1=8F=D1=89?= =?utf8?q?=D0=B5=D0=B3=D0=BE=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=B0=20?= =?utf8?q?=D0=B2=20=D1=8F=D0=B2=D0=BD=D0=BE=D0=BC=20=D0=B2=D0=B8=D0=B4?= =?utf8?q?=D0=B5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- weathermon.lua | 70 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 65 insertions(+), 5 deletions(-) diff --git a/weathermon.lua b/weathermon.lua index 3e940cd..c979830 100755 --- a/weathermon.lua +++ b/weathermon.lua @@ -13,6 +13,14 @@ function getConfig() web_iface = cur.get(config,"web","iface") + if web_iface then + + command = '/sbin/ifconfig '..web_iface..' | grep \'\\\' | sed -n \'1p\' | tr -s \' \' | cut -d \' \' -f3 | cut -d \':\' -f2' + f=io.popen(command,'r') + ip_addr=f:read() + + end + if not web_devid then if web_iface then @@ -34,6 +42,10 @@ function getConfig() 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 @@ -45,6 +57,7 @@ function getConfig() 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") if mqtt_host and not mqtt_id then mqtt_id="weather-"..web_devid @@ -58,6 +71,10 @@ function getConfig() mqtt_topic = 'weathermon/'..web_devid end + if mqtt_host and not mqtt_alarm_topic then + mqtt_alarm_topic = 'alarm/'..web_devid + end + end require "socket" @@ -102,7 +119,7 @@ function submitValue(type,id,param,val) command = "curl" if web_iface then - command = command.." --interface "..web_iface + command = command.." --interface "..ip_addr end if web_user then @@ -111,9 +128,7 @@ function submitValue(type,id,param,val) command = command.." \""..url.."\"" - print(command) os.execute(command) - print("") end @@ -153,11 +168,45 @@ function processLine(str) submitValue(sensor_type,sensor_id,k,v) mqtt_param[k]=v end - mqtt_msg = { type=sensor_type, data=mqtt_param } + mqtt_msg = { type=sensor_type, id=sensor_id, data=mqtt_param } if mqtt_client then serializedString = json.encode(mqtt_msg) mqtt_client:publish(mqtt_topic,serializedString) 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 nil + value=recrd[2] or nil + if value then + if key=="TYPE" then + alarm_type=value + elseif key=="ID" then + alarm_id=value + else + mqtt_param[key]=value + end + end + end + if mqtt_client then + mqtt_msg = { type = alarm_type, id = alarm_id, data = mqtt_param } + serializedString = json.encode(mqtt_msg) + mqtt_client:publish(mqtt_alarm_topic,serializedString) + 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 @@ -171,7 +220,18 @@ if mqtt_host then json = require( "json" ) end -serialin=io.open(serial_port,"r") +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) -- 2.34.1