R-2.9.12

scripts/service/linux.py

@@ -7,37 +7,37 @@ class LinuxService(ServiceBase):
         ServiceBase.__init__(self, name, label, stdout, stderr)
         self.pidfile = '/tmp/%s.pid' % name
         self.config_file = '/etc/%s.conf' % name
-    
+
     def daemonize(self):
         """
-        do the UNIX double-fork magic, see Stevens' "Advanced 
+        do the UNIX double-fork magic, see Stevens' "Advanced
         Programming in the UNIX Environment" for details (ISBN 0201563177)
         http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
         """
-        try: 
-            pid = os.fork() 
+        try:
+            pid = os.fork()
             if pid > 0:
                 # exit first parent
-                sys.exit(0) 
-        except OSError, e: 
+                sys.exit(0)
+        except OSError, e:
             sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
             return
-    
+
         # decouple from parent environment
-        os.chdir("/") 
-        os.setsid() 
-        os.umask(0) 
-    
+        os.chdir("/")
+        os.setsid()
+        os.umask(0)
+
         # do second fork
-        try: 
-            pid = os.fork() 
+        try:
+            pid = os.fork()
             if pid > 0:
                 # exit from second parent
-                sys.exit(0) 
-        except OSError, e: 
+                sys.exit(0)
+        except OSError, e:
             sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
             return
-    
+
         # redirect standard file descriptors
         sys.stdout.flush()
         sys.stderr.flush()
@@ -47,25 +47,25 @@ class LinuxService(ServiceBase):
         os.dup2(si.fileno(), sys.stdin.fileno())
         os.dup2(so.fileno(), sys.stdout.fileno())
         os.dup2(se.fileno(), sys.stderr.fileno())
-        
+
     def getpid(self):
         # Check for a pidfile to see if the daemon already runs
-        try:                
+        try:
             pf = file(self.pidfile,'r')
             pid = int(pf.read().strip())
             pf.close()
         except IOError:
             pid = None
-            
+
         return pid
-        
+
     def status(self):
         pid = self.getpid()
         if pid:
             return 'Service running with PID %s.' % pid
         else:
             return 'Service is not running.'
-            
+
     def check_permissions(self):
         if not os.geteuid() == 0:
             return (False, 'This script must be run with root permissions.')
@@ -77,12 +77,12 @@ class LinuxService(ServiceBase):
         Start the daemon
         """
         pid = self.getpid()
-    
+
         if pid:
             message = "Service already running under PID %s\n"
             sys.stderr.write(message % self.pidfile)
             return
-        
+
         # Start the daemon
         self.daemonize()
         self.run()
@@ -92,13 +92,13 @@ class LinuxService(ServiceBase):
         Stop the daemon
         """
         pid = self.getpid()
-    
+
         if not pid:
             message = "Service is not running\n"
             sys.stderr.write(message)
             return # not an error in a restart
 
-        # Try killing the daemon process    
+        # Try killing the daemon process
         try:
             while 1:
                 os.kill(pid, SIGTERM)
@@ -118,19 +118,19 @@ class LinuxService(ServiceBase):
         """
         self.stop()
         self.start()
-        
+
     def run(self):
         atexit.register(self.terminate)
-        
+
         args = self.load_configuration()[0]
         stdout = open(self.stdout, 'a+')
         stderr = open(self.stderr, 'a+')
         process = subprocess.Popen(args, stdout=stdout, stderr=stderr)
         file(self.pidfile,'w+').write("%s\n" % process.pid)
         process.wait()
-        
+
         self.terminate()
-        
+
     def terminate(self):
         try:
             os.remove(self.pidfile)
@@ -152,7 +152,7 @@ class LinuxService(ServiceBase):
         install_command = self.get_service_installer_command(env)
         result = self.run_command(*install_command)
         self.start()
-        
+
     def uninstall(self):
         self.stop()
         env = self.detect_environment()
@@ -164,7 +164,7 @@ class LinuxService(ServiceBase):
         # remove link to the script from the service directory
         path = env['rc.d-path'] + self.name
         os.remove(path)
-        
+
     def detect_environment(self):
         """
         Returns a dictionary of command/path to the required command-line applications.
@@ -196,7 +196,7 @@ class LinuxService(ServiceBase):
             env['rc.d-path'] = '/dev/null/'
 
         return env
-        
+
     def get_service_installer_command(self, env):
         """
         Returns list of args required to set a service to run on boot.
@@ -218,4 +218,3 @@ class LinuxService(ServiceBase):
         else:
             cmd = env['update-rc.d']
             return [cmd, self.name, 'remove']
-