Merge pull request #1 from ternstor/master

Fixed args for start() call on restart().

Author: danielroseman

initd.py

@@ -6,7 +6,7 @@
 
 from __future__ import with_statement
 
-import logging, os, signal, sys, time
+import logging, os, signal, sys, time, errno
 
 __all__ = ['start', 'stop', 'restart', 'execute']
 
@@ -100,8 +100,14 @@ def stop(self, run=None, exit=None):
         signal to the process with that as its pid.  This will also wait until
         the running process stops running.
         """
-        with open(self.pid_file, 'r') as stream:
-            pid = int(stream.read())
+        try:
+            with open(self.pid_file, 'r') as stream:
+                pid = int(stream.read())
+        except IOError as ioe:
+            if ioe.errno != errno.ENOENT:
+                raise
+            sys.stdout.write('Stopped.\n')
+            return
         sys.stdout.write('Stopping.')
         sys.stdout.flush()
         os.kill(pid, signal.SIGTERM)
@@ -123,7 +129,7 @@ def restart(self, run, exit=None):
         if os.path.exists(self.pid_file):
             self.stop(self.pid_file)
         print 'Starting.'
-        self.start(run, self.pid_file, self.log_file)
+        self.start(run, exit=exit)
 
 
     def execute(self, action, run=None, exit=None):