start/stop omf-slicemgr properly

[plcapi.git] / omf / omf-slicemgr.py

diff --git a/omf/omf-slicemgr.py b/omf/omf-slicemgr.py
index f1bf1d1..24cf701 100644 (file)
--- a/omf/omf-slicemgr.py
+++ b/omf/omf-slicemgr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 # Baris Metin <tmetin@sophia.inria.fr>
 
 import os
@@ -192,17 +192,17 @@ class PubSubClient(BaseClient):
 
 
 
-class Slicemgr(PubSubClient, xmlrpc.XMLRPC):
+class Slicemgr(xmlrpc.XMLRPC, PubSubClient):
     
     DOMAIN = "/OMF"
     RESOURCES = 'resources'
 
     def __init__(self, id, secret, verbose = False, log = None):
+        xmlrpc.XMLRPC.__init__(self, allowNone=True)
         PubSubClient.__init__(self, id, secret, verbose = verbose, log = log)
         self.command_queue = Queue.Queue()
 
-        # for xmlrpc interface
-        self.allowNone = True
+        xmlrpc.addIntrospection(self)
 
     def xmlrpc_createSlice(self, slice):
         self.create_slice(slice)
@@ -264,7 +264,7 @@ if __name__ == "__main__":
     t = task.LoopingCall(slicemgr.flush_commands)
     t.start(5.0) # check every 5 seconds
     reactor.connectTCP(slicemgr.id.host, 5222, slicemgr.factory)
-    reactor.listenTCP(5053, server.Site(slicemgr))
+    reactor.listenTCP(5053, server.Site(slicemgr), interface="localhost")
     reactor.run(installSignalHandlers=True)