From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 8 Mar 2010 17:26:15 +0000 (+0000)
Subject: quick fix to start omf-slicemgr
X-Git-Tag: PLCAPI-5.0-3^2~25
X-Git-Url: http://git.onelab.eu/?p=plcapi.git;a=commitdiff_plain;h=765d57b8d71cbd8a662f475f9367d1aaf31ccd35

quick fix to start omf-slicemgr
---

diff --git a/omf/omf-slicemgr.py b/omf/omf-slicemgr.py
index 310e656..f1bf1d1 100644
--- a/omf/omf-slicemgr.py
+++ b/omf/omf-slicemgr.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 # Baris Metin <tmetin@sophia.inria.fr>
 
 import os
@@ -253,9 +254,9 @@ if __name__ == "__main__":
 
     config = Config("/etc/planetlab/plc_config")
 
-    xmppserver = self.config.PLC_OMF_XMPP_SERVER
-    xmppuser = "@".join([self.config.PLC_OMF_XMPP_USER, xmppserver])
-    xmpppass = self.config.PLC_OMF_XMPP_PASSWORD
+    xmppserver = config.PLC_OMF_XMPP_SERVER
+    xmppuser = "@".join([config.PLC_OMF_XMPP_USER, xmppserver])
+    xmpppass = config.PLC_OMF_XMPP_PASSWORD
     slicemgr = Slicemgr(xmppuser, xmpppass,
                         log=open("/var/log/omf/pubsub_client.log", "a"),
                         verbose=True)
diff --git a/plc.d/omf-slicemgr b/plc.d/omf-slicemgr
index 985cd6d..cf1aecd 100755
--- a/plc.d/omf-slicemgr
+++ b/plc.d/omf-slicemgr
@@ -23,7 +23,7 @@ case "$1" in
 	MESSAGE=$"Starting the OMF Slice Manager"
 	dialog "$MESSAGE"
 
-        daemon /usr/bin/omf-slicemgr.py
+        daemon /usr/bin/omf-slicemgr.py &
 
 	result "$MESSAGE"
 	;;