Changeset 175

Timestamp:

31/10/06 14:27:04 (2 years ago)

Author:

duncan

Message:

Corrected verbose level of debug messages

Files:

• trunk/wakeup/src/helpers/wakeupserver.py (modified) (10 diffs)

trunk/wakeup/src/helpers/wakeupserver.py

@@ -68 +68 @@
 
     def __init__(self):
-        _debug_('in __init__')
+        _debug_('in __init__', 2)
         self.now = now()
         self.resetTimeout()
@@ -99 +99 @@
                 try:
                     if os.stat(config.TV_RECORD_SCHEDULE)[stat.ST_MTIME] == mod_time:
-                        _debug_('Return cached data')
+                        _debug_('Return cached data', 2)
                         return scheduledRecordings
                 except OSError:
@@ -187 +187 @@
         _debug_('in findNextProgram', 2)
 
+        next_program = None
+
         progs = self.getScheduledRecordings().getProgramList()
-
-        next_program = None
         proglist = list(progs)
         proglist.sort(self.progsTimeCompare)
         for progitem in proglist:
             prog = progs[progitem]
-            _debug_('prog=%s' % (prog))
+            _debug_('prog=%s' % (prog), 2)
             try:
                 recording = prog.isRecording
@@ -200 +200 @@
             except:
                 recording = False
-            _debug_('recording=%s' % (recording))
             _debug_('prog.stop=%s, now=%s' % (localtime(prog.stop+config.TV_RECORD_PADDING_POST), self.now))
             if self.now > prog.stop + config.TV_RECORD_PADDING_POST:
+                _debug_('skipping %s' % (prog), 2)
                 continue
-            else:
-                _debug_('prog.stop=%s' % (localtime(prog.stop)))
 
             if not recording:
@@ -216 +214 @@
 
         self.next_program = next_program
-        _debug_('next_program=%s' % (next_program))
+        _debug_('%s' % (next_program))
         return next_program
 
 
     def shutdown(self):
+        '''execute the shutdown command (currently disabled)'''
+        return
         if not config.SHUTDOWN_SYS_CMD:
             return
@@ -315 +315 @@
         # 10 minuts is hardcoded in nvram_wakeup
         wakeup = localtime(self.next_wakeup) - TimeDelta(0,config.WAKEUP_REBOOT_TIME,0)
-        _debug_('wakeup=%s reboot=%s now=%s' % (localtime(self.next_wakeup), wakeup, self.now))
+        _debug_('wakeup=%s' % (localtime(self.next_wakeup)))
+        _debug_('reboot=%s' % (wakeup))
+        _debug_('now=%s' % (self.now))
         if self.now > wakeup:
             self.setMessage(-3, ('SUSPENDED BY NEXT WAKEUP IN %d MINS' % \
@@ -344 +346 @@
             self.need_reboot = False
             self.setMessage(0, ('TIME FOR NVRAM WAKEUP HAS BEEN SET'))
-            #self.shutdown()
+            self.shutdown()
             return
         elif self.nvram_rc == 1:
             self.need_reboot = True
             self.setMessage(0, ('TIME FOR NVRAM WAKEUP WITH REBOOT HAS BEEN SET'))
-            #self.shutdown()
+            self.shutdown()
             return
 
@@ -355 +357 @@
         self.need_reboot = False
         self.setMessage(0, ('TIME FOR NVRAM WAKEUP FAILED (%s)' % self.nvram_rc))
-        #self.shutdown()
+        self.shutdown()
         return
 
@@ -440 +442 @@
 
     def startMinuteCheck(self):
-        _debug_('in startMinuteCheck')
+        _debug_('in startMinuteCheck', 2)
         self.now = now()
         next_minute = ((int(self.now)/60) * 60 + 90) - int(self.now)
@@ -448 +450 @@
 
     def minuteCheck(self):
-        _debug_('in minuteCheck')
+        _debug_('in minuteCheck', 2)
         self.now = now()
         next_minute = ((int(self.now)/60) * 60 + 90) - int(self.now)