brmlab/brmdoor_libnfc
4
0
Fork 0
mirror of https://github.com/brmlab/brmdoor_libnfc.git synced 2025-06-08 00:24:00 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix sftp spaceapi upload, add logging for sftp upload

Browse source
This commit is contained in:
Ondrej Mikle 2018-07-24 19:55:05 +02:00
parent 43e5ecaab8
commit 71566fac2a
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
brmdoor_nfc_daemon.py
View file

@ -74,7 +74,7 @@ class BrmdoorConfig(object):
if self.useOpenSwitch: if self.useOpenSwitch:
self.switchStatusFile = self.config.get("open_switch", "status_file") self.switchStatusFile = self.config.get("open_switch", "status_file")
self.switchOpenValue = self.config.get("open_switch", "open_value") self.switchOpenValue = self.config.get("open_switch", "open_value")
self.useStatusUpload = self.config.getboolean("open_switch", "spaceapi_status_upload ") self.useStatusUpload = self.config.getboolean("open_switch", "spaceapi_status_upload")
if self.useStatusUpload: if self.useStatusUpload:
self.sftpHost = self.config.get("open_switch", "spaceapi_sftp_host") self.sftpHost = self.config.get("open_switch", "spaceapi_sftp_host")
self.sftpPort= self.config.getint("open_switch", "spaceapi_sftp_port") self.sftpPort= self.config.getint("open_switch", "spaceapi_sftp_port")
@ -386,7 +386,7 @@ class SpaceAPIUploader(object):
dirname, targetFname = os.path.split(self.config.sftpDestFile) dirname, targetFname = os.path.split(self.config.sftpDestFile)
spaceApiJson = json.load(file("spaceapi_template.json")) spaceApiJson = json.load(file("spaceapi_template.json"))
spaceApiJson["state"] = {"open": True, "lastchange": time.time()} spaceApiJson["state"] = {"open": isOpen, "lastchange": time.time()}
with tempfile.NamedTemporaryFile() as tf: with tempfile.NamedTemporaryFile() as tf:
json.dump(spaceApiJson, tf, indent=4, ensure_ascii=True, encoding='utf-8') json.dump(spaceApiJson, tf, indent=4, ensure_ascii=True, encoding='utf-8')
@ -435,8 +435,11 @@ class OpenSwitchThread(threading.Thread):
#this will upload status always upon brmdoor start, which is better than waiting until someone #this will upload status always upon brmdoor start, which is better than waiting until someone
#changes status with button #changes status with button
if self.config.useStatusUpload: if self.config.useStatusUpload:
isOpen = (status == self.openValue)
uploader = SpaceAPIUploader(self.config) uploader = SpaceAPIUploader(self.config)
uploader.upload(status == self.openValue) logging.info("Going to upload spaceAPI status, opened: %s, status: %s", isOpen, status)
uploader.upload(isOpen)
logging.info("SpaceAPI json status upload finished")
except Exception: except Exception:
#we could use retrying with @retry decorator, but it's likely that it wouldn't help with #we could use retrying with @retry decorator, but it's likely that it wouldn't help with
#current connection/upload/out of disk space or similar problem #current connection/upload/out of disk space or similar problem