autorun: modified server daemon pid path

diff --git a/autorun/Util.py b/autorun/Util.py
index 967ec55..478918a 100644 (file)
--- a/autorun/Util.py
+++ b/autorun/Util.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+DAEMON_PID_PATH = "/var/run/autorun-server.pid"
 SERVER_DIR = "/home/p2p/cs-p2p-next/autorun/server/"
 SERVER_FILE = "Server.py"
 SERVER_TYPE = "python"

diff --git a/autorun/server/Server.py b/autorun/server/Server.py
index c40432b..9da44d2 100644 (file)
--- a/autorun/server/Server.py
+++ b/autorun/server/Server.py
@@ -386,16 +386,16 @@ if __name__ == "__main__":
                 print "usage:\n\t %s start <host_ip> " % sys.argv[0]
                 sys.exit(2)
 
-            daemon = MyDaemon('/tmp/daemon-example.pid', sys.argv[2], stdout = '/home/p2p/out', stderr = '/home/p2p/err') 
+            daemon = MyDaemon(DAEMON_PID_PATH, sys.argv[2], stdout = '/home/p2p/out', stderr = '/home/p2p/err') 
             daemon.start()
         elif 'stop' == sys.argv[1]:
-            daemon = MyDaemon('/tmp/daemon-example.pid')
+            daemon = MyDaemon(DAEMON_PID_PATH)
             daemon.stop()
         elif 'restart' == sys.argv[1]:
-            daemon = MyDaemon('/tmp/daemon-example.pid') 
+            daemon = MyDaemon(DAEMON_PID_PATH) 
             daemon.restart()
         elif 'no' == sys.argv[1]: #no daemon
-            daemon = MyDaemon('/tmp/daemon-example.pid', sys.argv[2], stdout = '/home/p2p/out', stderr = '/home/p2p/err') 
+            daemon = MyDaemon(DAEMON_PID_PATH, sys.argv[2], stdout = '/home/p2p/out', stderr = '/home/p2p/err') 
             daemon.do_Server(sys.argv[2],"")
         else:
             print "Unknown command"

diff --git a/autorun/server/start-server b/autorun/server/start-server
index 4267b77..d2253cf 100755 (executable)
--- a/autorun/server/start-server
+++ b/autorun/server/start-server
@@ -6,4 +6,5 @@ if test $# -ne 1; then
 fi
 
 ip_address=$1
+rm /var/run/autorun-server.pid 
 PYTHONPATH=/home/p2p/cs-p2p-next/ppf/log-parser/generic python /home/p2p/cs-p2p-next/autorun/server/Server.py no $ip_address