pylint

mudpy/sys/server.py

@@ -7,11 +7,16 @@
 from twisted.internet.endpoints import TCP4ServerEndpoint
 from twisted.internet import reactor
 import random, time, __main__
-from . import wireframe, debug
+from . import wireframe, debug, observer
 
 __config__ = wireframe.create("config.server")
 __init_time__ = time.time()
 
+if '__mudpy__' in __main__:
+    __publisher__ = getattr(__main__, '__mudpy__')
+else:
+    __publisher__ = observer.Observer()
+
 def heartbeat():
     """Callback provided to twisted for communicating between game threads."""
 
@@ -20,16 +25,16 @@ def heartbeat():
         __config__['intervals']['tick']['lowbound'], \
         __config__['intervals']['tick']['highbound'])
     while(1):
-        __main__.__mudpy__.fire('cycle')
+        __publisher__.fire('cycle')
         if time.time() >= next_pulse:
             next_pulse += __config__['intervals']['pulse']
-            __main__.__mudpy__.fire('pulse')
-            __main__.__mudpy__.fire('stat')
+            __publisher__.fire('pulse')
+            __publisher__.fire('stat')
         if time.time() >= next_tick:
             next_tick = int(time.time()+random.randint(
                 __config__['intervals']['tick']['lowbound'], \
                 __config__['intervals']['tick']['highbound']))
-            __main__.__mudpy__.fire('tick')
+            __publisher__.fire('tick')
             rel_next_tick = int(next_tick-time.time())
             debug.log("tick; next in "+str(rel_next_tick)+" seconds")