fixed memory bug at client handling of door_daeon and powersensordaemon

[svn42.git] / track-presence.py

diff --git a/track-presence.py b/track-presence.py
index 9ba0ac9..012b222 100755 (executable)
--- a/track-presence.py
+++ b/track-presence.py
@@ -46,11 +46,14 @@ class UWSConfig:
     self.config_parser.set('sensors','remote_socket',"/var/run/powersensordaemon/cmd.sock")
     self.config_parser.set('sensors','remote_shell',"usocket")
     self.config_parser.add_section('tracker')
-    self.config_parser.set('tracker','sec_necessary_to_move_through_door',"10.0")
+    self.config_parser.set('tracker','sec_wait_after_close_using_cardphone',"4.2")
+    self.config_parser.set('tracker','sec_wait_for_movement_before_warning',"30")
+    self.config_parser.set('tracker','sec_wait_after_close_using_manualswitch',"25.0")
+    self.config_parser.set('tracker','sec_movement_before_manual_switch',"-1.0")  #neg duration means: movement has to occur _after_ door was closed manually
     self.config_parser.set('tracker','sec_general_movement_timeout',"3600")
     self.config_parser.set('tracker','server_socket',"/var/run/tuer/presence.socket")
     self.config_parser.set('tracker','photo_flashlight',"1020")
-    self.config_parser.set('tracker','photo_artif_light',"960")
+    self.config_parser.set('tracker','photo_artif_light',"970")
     self.config_parser.add_section('debug')
     self.config_parser.set('debug','enabled',"False")
     self.config_mtime=0
@@ -175,7 +178,8 @@ def trackSensorStatusThread(uwscfg,status_tracker,connection_listener):
         if len(line) < 1:
           raise Exception("EOF on Subprocess, daemon seems to have quit, returncode: %d",sshp.returncode)
         logging.debug("trackSensorStatusThread: Got Line: " + line)
-        connection_listener.distributeData(line)
+        if not line.startswith("Warning: Permanently added"):
+          connection_listener.distributeData(line)
         m = RE_MOVEMENT.match(line)
         if not m is None:
           status_tracker.movementDetected()
@@ -300,6 +304,7 @@ class StatusTracker: #(threading.Thread):
     self.presence_notify_lock=threading.Lock()
     #timer
     self.timer=None
+    self.timer_timeout=0
     
   def doorOpen(self,who,how):
     self.uwscfg.checkConfigUpdates()
@@ -308,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()
@@ -316,6 +321,7 @@ class StatusTracker: #(threading.Thread):
       self.lock.acquire()
       self.door_open_previously = self.door_open
     self.lock.release()
+    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()
@@ -324,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()
@@ -332,6 +338,8 @@ class StatusTracker: #(threading.Thread):
       self.lock.acquire()
       self.door_open_previously = self.door_open
     self.lock.release()
+    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.uwscfg.checkConfigUpdates()
@@ -362,12 +370,13 @@ class StatusTracker: #(threading.Thread):
 
 
   def checkAgainIn(self, sec):
-    #~ if not self.timer is None:
-      #~ logging.debug("checkAgainIn: canceled previous running Timer")
-      #~ self.timer.cancel()
-    logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
-    self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
-    self.timer.start()
+    if self.timer_timeout < time.time():
+      logging.debug("checkAgainIn: starting Timer with timeout %fs" % sec)
+      self.timer=threading.Timer(sec, self.checkPresenceStateChangeAndNotify)
+      self.timer.start()
+      self.timer_timeout = time.time() + sec
+    else:
+      logging.debug("checkAgainIn: not starting timer, already one scheduled in %fs" % (time.time() - self.timer_timeout))
   
   def somebodyPresent(self):
     with self.lock:
@@ -378,11 +387,15 @@ class StatusTracker: #(threading.Thread):
           return True
         else:
           return False
-      elif time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
-        #start timer, checkPresenceStateChangeAndNotify after tracker_sec_wait_movement
-        self.checkAgainIn(float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
+      elif self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch):
+        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_manualswitch))
         return self.last_somebody_present_result
-      elif self.last_movement_unixts > self.last_door_operation_unixts and (self.door_manual_switch_used or ( time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout))):
+      elif not self.door_manual_switch_used and time.time() - self.last_door_operation_unixts <= float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone):
+        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_after_close_using_cardphone))
+        return self.last_somebody_present_result
+      elif self.door_manual_switch_used and self.last_movement_unixts > self.last_door_operation_unixts - float(self.uwscfg.tracker_sec_movement_before_manual_switch):
+        return True
+      elif self.last_movement_unixts > self.last_door_operation_unixts and time.time() - self.last_movement_unixts < float(self.uwscfg.tracker_sec_general_movement_timeout):
         return True
       else:
         return False
@@ -390,10 +403,10 @@ class StatusTracker: #(threading.Thread):
   def getPossibleWarning(self):
     with self.lock:
       somebody_present=self.last_somebody_present_result
-      if self.door_open and not somebody_present and time.time() - self.last_door_operation_unixts >= 2* float(self.uwscfg.tracker_sec_necessary_to_move_through_door):
+      if self.door_open and not somebody_present and time.time() - self.last_door_operation_unixts >= float(self.uwscfg.tracker_sec_wait_for_movement_before_warning):
         return "Door opened recently but nobody present"
       elif self.door_open and not somebody_present:
-        self.checkAgainIn(2*float(self.uwscfg.tracker_sec_necessary_to_move_through_door))
+        self.checkAgainIn(float(self.uwscfg.tracker_sec_wait_for_movement_before_warning))
         return None
 #      elif not somebody_present and self.last_light_unixts > self.last_door_operation_unixts and self.last_light_value > int(self.uwscfg.tracker_photo_artif_light):
 #return "Nobody here but light is still on"