Add information to threads about scheduled action time

src/automate/callables/builtin_callables.py

@@ -23,6 +23,8 @@
 
 from __future__ import unicode_literals
 from builtins import bytes
+
+import datetime
 from future import standard_library
 standard_library.install_aliases()
 
@@ -543,7 +545,8 @@ def call(self, caller, **kwargs):
             delay = self.call_eval(self.delay, caller, **kwargs)
             timer = threading.Timer(delay, None)
             timer.function = threaded(self._run, caller, timer, **kwargs)
-            timer.name = "Timer for " + str(self) + " %d sek" % delay
+            time_after_delay = datetime.datetime.now() + datetime.timedelta(seconds=delay)
+            timer.name = "Timer for %s timed at %s (%d sek)" % (self, time_after_delay, delay)
             timer.start()
             timers.append(timer)
 

src/automate/sensors/builtin_sensors.py

@@ -229,7 +229,7 @@ def _setup_next_update(self, next_update_time):
         delay = next_update_time - now + timedelta(seconds=5)
         self.logger.debug('Setting timer to %s, %s seconds, at %s', delay, delay.seconds, now+delay)
         self._update_timer = threading.Timer(delay.seconds, threaded(self.update_status,))
-        self._update_timer.name = ("Timer for TimerSensor " + self.name + " at %s" % (now + delay))
+        self._update_timer.name = ("Timer for TimerSensor %s at %s" % (self.name, now + delay))
         self._update_timer.start()
 
     def cleanup(self):
@@ -313,7 +313,8 @@ def _restart(self):
         if self.poll_active:
             self.update_status()
             self._pollthread = threading.Timer(self.interval, threaded(self._restart))
-            self._pollthread.name = "PollingSensor: " + self.name + " %.2f sek" % self.interval
+            time_after_interval = datetime.now() + timedelta(seconds=self.interval)
+            self._pollthread.name = "PollingSensor: %s next poll at %s (%.2f sek)" % (self.name, time_after_interval, self.interval)
             self._pollthread.start()
 
     def update_status(self):

src/automate/statusobject.py

@@ -29,6 +29,7 @@
 import time
 import sys
 
+import datetime
 from traits.api import (cached_property, Any, CBool, Instance, Dict, Str, CFloat,
                         List, Enum, Bool, Property, Event)
 from traits.trait_errors import TraitError
@@ -306,11 +307,12 @@ def timer_func(func, *args):
             else:
                 timesince = time.time() - self._last_changed
                 delaytime = max(0, self.safety_delay - timesince, changedelay)
+                time_after_delay = datetime.datetime.now() + datetime.timedelta(seconds=delaytime)
                 logger("Scheduling safety/change_delay timer for %f sek. Now %s. Going to change to %s.",
                        delaytime, self._status, status)
                 self._timed_action = threading.Timer(delaytime, timer_func,
                                                      args=(self._add_statuschange_to_queue, status, getattr(self, "program", None), True))
-                self._timed_action.name = "Safety/change_delay for " + self.name + " %f sek" % delaytime
+                self._timed_action.name = "Safety/change_delay for %s timed at %s (%f sek)" % (self.name, time_after_delay, delaytime)
                 self._timed_action.start()
                 return False