X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=track-presence.py;h=891ccf79c4c9afa63f1a66b347873dc9dc2ddf87;hb=a0e83b162b3af93aa7b33503e7520f5c5ac58d7e;hp=c71be1544e92d6c441415aa89a5460fd03ee9322;hpb=afc46eeb3d8e74c06d4b5a47e81e89548333a6fc;p=svn42.git diff --git a/track-presence.py b/track-presence.py index c71be15..891ccf7 100755 --- a/track-presence.py +++ b/track-presence.py @@ -313,7 +313,7 @@ class StatusTracker: #(threading.Thread): if self.door_open != self.door_open_previously: self.door_who=who self.door_manual_switch_used=(who is None or len(who) == 0) - self.door_physically_present=(self.door_manual_switch_used or how == "Card") + self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card")) if not self.door_open_previously is None: self.last_door_operation_unixts=time.time() self.lock.release() @@ -321,7 +321,7 @@ class StatusTracker: #(threading.Thread): self.lock.acquire() self.door_open_previously = self.door_open self.lock.release() - loggin.debug("doorOpen: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_manual_switch_used)); + logging.debug("doorOpen: open: %s, who: %s, how: %s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present)); def doorClosed(self,who,how): self.uwscfg.checkConfigUpdates() @@ -330,7 +330,7 @@ class StatusTracker: #(threading.Thread): if self.door_open != self.door_open_previously: self.door_who=who self.door_manual_switch_used=(who is None or len(who) == 0) - self.door_physically_present=(self.door_manual_switch_used or how == "Card") + self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card")) if not self.door_open_previously is None: self.last_door_operation_unixts=time.time() self.lock.release() @@ -338,7 +338,7 @@ class StatusTracker: #(threading.Thread): self.lock.acquire() self.door_open_previously = self.door_open self.lock.release() - loggin.debug("doorClosed: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_manual_switch_used)); + logging.debug("doorClosed: open: %s, who: %s, how:%s, manual_switch: %s; physically_present: %s" % (self.door_open,self.door_who,how,self.door_manual_switch_used,self.door_physically_present)); def movementDetected(self):