[Freevo-cvslog] Kaa r3178 - trunk/beacon/bin

[Dirk M. <di...@fr...>]

Author: dmeyer
Date: Tue Mar 11 13:03:33 2008
New Revision: 3178

Log:
Do not try to connect to beacon to probe if it is running
beacuse this will trigger notifier init which will prevent
the hal part from selecting nf_gtk.


Modified:
   trunk/beacon/bin/beacon-daemon

Modified: trunk/beacon/bin/beacon-daemon
==============================================================================
--- trunk/beacon/bin/beacon-daemon	(original)
+++ trunk/beacon/bin/beacon-daemon	Tue Mar 11 13:03:33 2008
@@ -147,18 +147,16 @@
     kaa.main.run()
     sys.exit(0)
 
-    
-# Start a new beacon server. If run in daemon mode we fork and detach from the
-# parent. After that a logger is created and the thumbnail server will be
-# forked out.
 
-try:
-    # this should not be possible
-    kaa.beacon.connect()
+if kaa.utils.is_running('beacon'):
     print 'beacon-daemon is already running.'
     sys.exit(1)
-except kaa.beacon.ConnectError:
-    pass
+
+kaa.utils.set_running('freevo-tvserver')
+
+# Start a new beacon server. If run in daemon mode we fork and detach from the
+# parent. After that a logger is created and the thumbnail server will be
+# forked out.
 
 if detach:
     if not logfile: