From 37883fdd57e2246043ee9f1f4c4c488104216cb5 Mon Sep 17 00:00:00 2001 From: Roman Bazalevskiy Date: Wed, 17 Oct 2018 22:34:32 +0300 Subject: [PATCH 1/1] =?utf8?q?=D0=9A=D0=BE=D1=80=D1=80=D0=B5=D0=BA=D1=82?= =?utf8?q?=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=BE=D0=B4=20=D0=B2=D1=81=D0=B5?= =?utf8?q?=D0=BC=D0=B8=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D0=B0=D0=BC?= =?utf8?q?=D0=B8=20=D0=BE=D1=82=D1=81=D1=82=D1=80=D0=B5=D0=BB=20=D0=B2?= =?utf8?q?=D1=81=D0=B5=D1=85=20=D0=BB=D0=B8=D1=88=D0=BD=D0=B8=D1=85=20?= =?utf8?q?=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81=D0=BE=D0=B2=20=D0=BF?= =?utf8?q?=D1=80=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BF=D1=83?= =?utf8?q?=D1=81=D0=BA=D0=B5.=20=D0=A2=D1=80=D0=B5=D0=B1=D1=83=D0=B5=D1=82?= =?utf8?q?=20=D0=BD=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20pkill.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- mqtt-bt/scan-beacons | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mqtt-bt/scan-beacons b/mqtt-bt/scan-beacons index fc11a48..210bcfb 100644 --- a/mqtt-bt/scan-beacons +++ b/mqtt-bt/scan-beacons @@ -1,6 +1,7 @@ #!/usr/bin/lua json = require("json") +socket = require("socket") function getConfig(configname) @@ -55,10 +56,10 @@ function getConfig(configname) end + hostname = socket.dns.gethostname() 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 @@ -112,8 +113,8 @@ end 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`") + run_command("/usr/bin/pkill btmon") + run_command("/usr/bin/pkill hcitool") f = assert(io.popen ("/usr/bin/stdbuf -o0 /usr/bin/btmon")) run_command("hciconfig hci0 down") run_command("hciconfig hci0 up") @@ -149,6 +150,8 @@ function process_packet(packet) local type local name + packet['origin'] = hostname + mac = packet['Address'] uuid = packet['UUID'] type = packet['Type'] -- 2.34.1