Author: dmeyer
Date: Sat Feb 3 17:49:19 2007
New Revision: 9140
Modified:
trunk/tvserver/bin/freevo-tvserver
Log:
use kaa.utils.set_running
Modified: trunk/tvserver/bin/freevo-tvserver
==============================================================================
--- trunk/tvserver/bin/freevo-tvserver (original)
+++ trunk/tvserver/bin/freevo-tvserver Sat Feb 3 17:49:19 2007
@@ -51,6 +51,15 @@
# kaa imports
import kaa
import kaa.utils
+import kaa.epg
+
+# freevo core imports
+import freevo.conf
+import freevo.ipc
+
+# read the config file
+from freevo.tvserver.config import config
+
def usage(error_code):
print 'freevo-tvserver [options]'
@@ -71,27 +80,17 @@
for o, a in opts:
if o == '--background':
+ if kaa.utils.is_running('freevo-tvserver'):
+ print 'tvserver already running'
+ sys.exit(1)
kaa.utils.daemonize()
if o == '--stop':
-
- def new_entity(entity):
- if entity.matches({'type': 'home-theatre', 'module': 'tvserver'}):
- entity.shutdown()
- sys.exit(0)
-
- def not_running():
+ pid = kaa.utils.is_running('freevo-tvserver')
+ if not pid:
print 'tvserver not running'
sys.exit(1)
-
- import kaa
- import freevo.ipc
-
- # connect to tvserver
- mbus = freevo.ipc.Instance('freevo')
- mbus.signals['new-entity'].connect(new_entity)
- kaa.notifier.OneShotTimer(not_running).start(5)
- kaa.main()
+ os.kill(pid, 15)
sys.exit(0)
if o == '--interactive':
@@ -105,21 +104,19 @@
sys.exit(0)
+# check and mark as running
+if kaa.utils.is_running('freevo-tvserver'):
+ print 'tvserver already running'
+ sys.exit(1)
+
+kaa.utils.set_running('freevo-tvserver')
+
# fork epg client.
read_fd, write_fd = os.pipe()
pid = os.fork()
if not pid:
- # This is the epg server. Import everything we need and start it
-
- # kaa imports
- import kaa.epg
-
- # freevo core imports
- import freevo.conf
-
- # read the config file
- from freevo.tvserver.config import config
+ # This is the epg server.
# logger setup
log = logging.getLogger()
@@ -161,17 +158,6 @@
# At this point we are the main tvserver
-# kaa imports
-import kaa
-import kaa.epg
-
-# freevo core imports
-import freevo.conf
-import freevo.ipc
-
-# get logging object
-log = logging.getLogger('record')
-
# get logging object
log = logging.getLogger('record')
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier.
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
