Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20756/src/helpers
Modified Files:
recordserver.py shutdown.py
Log Message:
use popen from notifier and remove util.popen
Index: recordserver.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/helpers/recordserver.py,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** recordserver.py 13 Feb 2005 18:44:26 -0000 1.74
--- recordserver.py 28 Jun 2005 15:56:07 -0000 1.75
***************
*** 36,40 ****
import logging
! import notifier
# create logger objects in sysconfig
--- 36,41 ----
import logging
! # kaa imports
! import kaa.notifier
# create logger objects in sysconfig
***************
*** 61,80 ****
# init the notifier
! notifier.init(notifier.GENERIC)
# import recordserver
import record.server
! # import popen for process managment
! import util.popen
try:
! record.server.RecordServer()
! notifier.loop()
! except KeyboardInterrupt:
! pass
except:
log.exception('recordserver crash')
! # kill all running recorder
! util.popen.killall()
--- 62,77 ----
# init the notifier
! kaa.notifier.init(kaa.notifier.GENERIC)
# import recordserver
import record.server
! # start recordserver
! record.server.RecordServer()
try:
! kaa.notifier.loop()
except:
log.exception('recordserver crash')
! kaa.notifier.shutdown()
Index: shutdown.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/helpers/shutdown.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** shutdown.py 25 Jun 2005 08:52:26 -0000 1.9
--- shutdown.py 28 Jun 2005 15:56:08 -0000 1.10
***************
*** 79,90 ****
import time
! # notifier and mbus
! import notifier
import mbus
# freevo imports
import config
import mcomm
- import util.popen
# get logging object
--- 79,91 ----
import time
! # mbus
import mbus
+ # kaa imports
+ import kaa.notifier
+
# freevo imports
import config
import mcomm
# get logging object
***************
*** 118,122 ****
"""
def __init__(self):
! notifier.addTimer(FIRST_START, self.check_mbus)
# notifier check timer, not set by first FIRST_START waiting
self.timer = None
--- 119,123 ----
"""
def __init__(self):
! kaa.notifier.addTimer(FIRST_START, self.check_mbus)
# notifier check timer, not set by first FIRST_START waiting
self.timer = None
***************
*** 139,144 ****
log.warning('entity change, set timer %s seconds' % \
(POLL_INTERVALL / 1000))
! notifier.removeTimer(self.timer)
! self.timer = notifier.addTimer(POLL_INTERVALL, self.check_mbus)
--- 140,145 ----
log.warning('entity change, set timer %s seconds' % \
(POLL_INTERVALL / 1000))
! kaa.notifier.removeTimer(self.timer)
! self.timer = kaa.notifier.addTimer(POLL_INTERVALL, self.check_mbus)
***************
*** 222,226 ****
log.info('reset all shutdown timer')
self.shutdown_counter = 6
! notifier.addTimer(FIRST_START, self.check_mbus)
return False
--- 223,227 ----
log.info('reset all shutdown timer')
self.shutdown_counter = 6
! kaa.notifier.addTimer(FIRST_START, self.check_mbus)
return False
***************
*** 238,242 ****
entity.call('status', self.rpcreturn)
# set timer for shutdown in 5 seconds
! self.timer = notifier.addTimer(5000, self.check_shutdown)
return False
--- 239,243 ----
entity.call('status', self.rpcreturn)
# set timer for shutdown in 5 seconds
! self.timer = kaa.notifier.addTimer(5000, self.check_shutdown)
return False
***************
*** 250,254 ****
log.info('set wakeup time: %s' % self.wakeuptime)
self.__last_wakeuptime = self.wakeuptime
! util.popen.Process(config.SHUTDOWN_WAKEUP_CMD % self.wakeuptime)
# internal varibale how long to wait next
--- 251,255 ----
log.info('set wakeup time: %s' % self.wakeuptime)
self.__last_wakeuptime = self.wakeuptime
! kaa.notifier.Process(config.SHUTDOWN_WAKEUP_CMD % self.wakeuptime)
# internal varibale how long to wait next
***************
*** 283,287 ****
log.info('Next check in %s minutes' % wait)
# set a new timer
! self.timer = notifier.addTimer(wait * 60000, self.check_mbus)
# reset counter
self.shutdown_counter = max(self.shutdown_counter, 6)
--- 284,288 ----
log.info('Next check in %s minutes' % wait)
# set a new timer
! self.timer = kaa.notifier.addTimer(wait * 60000, self.check_mbus)
# reset counter
self.shutdown_counter = max(self.shutdown_counter, 6)
***************
*** 294,298 ****
log.info('Next check in 5 minutes')
# reschedule checking
! self.timer = notifier.addTimer(5 * POLL_INTERVALL,
self.check_mbus)
# set counter to 31 ( == 30 minutes after important the program
# has quit)
--- 295,300 ----
log.info('Next check in 5 minutes')
# reschedule checking
! self.timer = kaa.notifier.addTimer(5 * POLL_INTERVALL,
! self.check_mbus)
# set counter to 31 ( == 30 minutes after important the program
# has quit)
***************
*** 311,315 ****
log.info('Next check in %s minutes' % wait)
# set a new timer
! self.timer = notifier.addTimer(wait * 60000, self.check_mbus)
# reset counter
self.shutdown_counter = max(self.shutdown_counter, 6)
--- 313,317 ----
log.info('Next check in %s minutes' % wait)
# set a new timer
! self.timer = kaa.notifier.addTimer(wait * 60000,
self.check_mbus)
# reset counter
self.shutdown_counter = max(self.shutdown_counter, 6)
***************
*** 329,333 ****
log.warning('system shutdown system in %s minutes' % \
self.shutdown_counter)
! self.timer = notifier.addTimer(POLL_INTERVALL, self.check_mbus)
return False
--- 331,335 ----
log.warning('system shutdown system in %s minutes' % \
self.shutdown_counter)
! self.timer = kaa.notifier.addTimer(POLL_INTERVALL,
self.check_mbus)
return False
***************
*** 336,345 ****
# shutdown the system
! util.popen.Process(config.SHUTDOWN_SYS_CMD)
# set new timer in case we hibernate, set self.timer so it looks like
# the normal startup timer
self.timer = None
! notifier.addTimer(FIRST_START, self.check_mbus)
return False
--- 338,347 ----
# shutdown the system
! kaa.notifier.Process(config.SHUTDOWN_SYS_CMD)
# set new timer in case we hibernate, set self.timer so it looks like
# the normal startup timer
self.timer = None
! kaa.notifier.addTimer(FIRST_START, self.check_mbus)
return False
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
