- Управление вспомогательными процессами - на совести init-скриптов.

[openhab-process.git] / mqtt-bt / scan-beacons

diff --git a/mqtt-bt/scan-beacons b/mqtt-bt/scan-beacons
index fc11a48a28725831eed97366284b2ccf86be9716..d6d0d26f0006f64c68ca5a2afe6561c39a08b607 100644 (file)
--- a/mqtt-bt/scan-beacons
+++ b/mqtt-bt/scan-beacons
@@ -1,6 +1,7 @@
 #!/usr/bin/lua
 
 json = require("json")
 #!/usr/bin/lua
 
 json = require("json")

+socket = require("socket")

 
 function getConfig(configname)
 
 
 function getConfig(configname)
 


@@ -55,10 +56,10 @@ function getConfig(configname)
   
   end
 
   
   end
 

+  hostname = socket.dns.gethostname()

   if mqtt_host and not mqtt_id then
     socket = require("socket")
     posix = require("posix")
   if mqtt_host and not mqtt_id then
     socket = require("socket")
     posix = require("posix")

-    hostname = socket.dns.gethostname()

     pid = posix.getpid()
     mqtt_id="beaconmon-"..hostname.."-"..pid
   end
     pid = posix.getpid()
     mqtt_id="beaconmon-"..hostname.."-"..pid
   end


@@ -97,7 +98,10 @@ end
 function printLog(str)
   if logging=="yes" then
     capture("logger -t beaconmon \""..str.."\"")
 function printLog(str)
   if logging=="yes" then
     capture("logger -t beaconmon \""..str.."\"")

-  else 
+    print(str)  
+  elseif logging=="syslog" then
+    capture("logger -t beaconmon \""..str.."\"")
+  elseif logging=="stdout" then 

     print(str)  
   end 
 end
     print(str)  
   end 
 end


@@ -112,12 +116,10 @@ end
 
 function open_dump()
 
 
 function open_dump()
 

-  run_command("/usr/bin/pgrep btmon && /bin/kill `/usr/bin/pgrep btmon`")
-  run_command("/usr/bin/pgrep btmon && /bin/kill `/usr/bin/pgrep hcitool`")
-  f = assert(io.popen ("/usr/bin/stdbuf -o0 /usr/bin/btmon"))
+  f = assert(io.popen ("/usr/bin/btmon"))

   run_command("hciconfig hci0 down")
   run_command("hciconfig hci0 up")
   run_command("hciconfig hci0 down")
   run_command("hciconfig hci0 up")

-  f_null = assert(io.popen ("hcitool lescan --duplicates --passive"))
+  f_null = assert(io.popen ("hcitool lescan --duplicates"))

 
   return f
 
 
   return f
 


@@ -149,6 +151,8 @@ function process_packet(packet)
   local type
   local name
 
   local type
   local name
 

+  packet['origin'] = hostname
+

   mac = packet['Address']
   uuid = packet['UUID']
   type = packet['Type']
   mac = packet['Address']
   uuid = packet['UUID']
   type = packet['Type']