self.last_movement_unixts=0
self.last_light_value=0
self.last_light_unixts=0
- self.lock=threading.Lock()
+ self.lock=threading.RLock()
#Notify State locked by self.presence_notify_lock
self.last_somebody_present_result=False
self.last_warning=None
self.count_same_warning=0
self.who_might_be_here=None
- self.presence_notify_lock=threading.Lock()
+ self.presence_notify_lock=threading.RLock()
#timer
self.timer=None
self.timer_timeout=0
self.door_open=True
if self.door_open != self.door_open_previously:
self.door_who=who
+ self.lock.release()
+ self.updateWhoMightBeHere(who)
+ self.lock.acquire()
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
+ self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
- self.updateWhoMightBeHere(who)
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.door_open=False
if self.door_open != self.door_open_previously:
self.door_who=who
+ self.lock.release()
+ self.updateWhoMightBeHere(who)
+ self.lock.acquire()
self.door_manual_switch_used=(who is None or len(who) == 0)
- self.door_physically_present=(self.door_manual_switch_used or how.startswith("Card"))
+ self.door_physically_present=(self.door_manual_switch_used or (not how is None and how.startswith("Card")))
if not self.door_open_previously is None:
self.last_door_operation_unixts=time.time()
self.lock.release()
self.lock.acquire()
self.door_open_previously = self.door_open
self.lock.release()
- self.updateWhoMightBeHere(who)
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):
self.last_somebody_present_result = somebody_present
if not self.status_change_handler is None:
self.status_change_handler(somebody_present, door_open=self.door_open, who=self.who_might_be_here)
+ self.forgetWhoMightBeHere(somebody_present)
warning = self.getPossibleWarning()
if warning == self.last_warning:
self.count_same_warning+=1
logging.debug("checkPresenceStateChangeAndNotify: warning: " + str(warning))
if not self.status_change_handler is None:
self.status_change_handler(somebody_present=None, door_open=self.door_open, who=self.who_might_be_here, warning=warning)
- self.forgetWhoMightBeHere(somebody_present)
############ Connection Listener ############
class ConnectionListener: