fix up the wrapper scripts so that --daemon works correctly, and so

the init scripts also work correctly

1 files changed, 6 insertions, 6 deletions

diff --git a/minion/server.py b/minion/server.py
index 823d072..3762095 100755
--- a/minion/server.py
+++ b/minion/server.py
@@ -193,17 +193,17 @@ def main(argv):
     print ""
     print "Seriously.\n\n"
 
-    try:
-        serve()
-    except codes.FuncException, e:
-        print >> sys.stderr, 'error: %s' % e
-        sys.exit(1)
 
     if "daemon" in sys.argv or "--daemon" in sys.argv:
-        utils.daemonize("/var/run/vf_server.pid")
+        utils.daemonize("/var/run/funcd.pid")
     else:
         print "serving...\n"
 
+    try:
+        serve()
+    except codes.FuncException, e:
+        print >> sys.stderr, 'error: %s' % e
+        sys.exit(1)
        
 # ======================================================================================