From: Roman Bazalevskiy <rvb@rvb.name>
Date: Sun, 21 Oct 2018 11:10:33 +0000 (+0300)
Subject: Переход на mosquitto
X-Git-Url: https://git.rvb.name/weathermon.git/commitdiff_plain/466c75a8854e8f81a5ee07128b771b308943858b?ds=sidebyside

Переход на mosquitto
---

diff --git a/weathermon.lua b/weathermon.lua
index b43b72c..683d406 100755
--- a/weathermon.lua
+++ b/weathermon.lua
@@ -172,7 +172,7 @@ function submitValue(type,id,param,val)
     command = command.." -u "..web_user..":"..web_pass
   end
 
-  command = command.." \""..url.."\""
+  command = command.." \""..url.."\" 2>&1"
 
   result = capture(command)
 
@@ -203,7 +203,7 @@ function processJson(str)
       sensor["command"]="alarm"
     end
     for k,v in pairs(sensor) do
-      printLog("Type = "..sensor_type..", ID = "..sensor_id..", Param = "..k..", Value = "..v)
+      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,"{(.-)}", 
@@ -337,12 +337,12 @@ end
 getConfig(arg[1])
 
 if mqtt_host then
-  MQTT = require "paho.mqtt"
-  mqtt_client = MQTT.client.create(mqtt_host, mqtt_port)
+  MQTT = require "mosquitto"
+  mqtt_client = MQTT.new(mqtt_id)
   if mqtt_user then
-    mqtt_client:auth(mqtt_user, mqtt_passwd)
+    mqtt_client:login_set(mqtt_user, mqtt_passwd)
   end
-  mqtt_client:connect(mqtt_id)
+  mqtt_client:connect(mqtt_host,mqtt_port)
 end
 
 if serial_port then