R-2.9.12

scripts/service/service.py

@@ -17,14 +17,14 @@ class ServiceBase(Base):
         self.stdout = stdout
         self.stderr = stderr
         self.config_file = None
-        
+
     def load_configuration(self):
         """
         Loads the configuration required to build the command-line string
         for running web2py. Returns a tuple (command_args, config_dict).
         """
         s = os.path.sep
-        
+
         default = dict(
             python = 'python',
             web2py = os.path.join(s.join(__file__.split(s)[:-3]), 'web2py.py'),
@@ -38,14 +38,14 @@ class ServiceBase(Base):
             https_cert = '',
             password = '<recycle>',
         )
-        
+
         config = default
         if self.config_file:
             try:
                 f = open(self.config_file, 'r')
                 lines = f.readlines()
                 f.close()
-            
+
                 for line in lines:
                     fields = line.split('=', 1)
                     if len(fields) == 2:
@@ -55,10 +55,10 @@ class ServiceBase(Base):
                         config[key] = value
             except:
                 pass
-        
+
         web2py_path = os.path.dirname(config['web2py'])
         os.chdir(web2py_path)
-        
+
         args = [config['python'], config['web2py']]
         interfaces = []
         ports = []
@@ -78,68 +78,68 @@ class ServiceBase(Base):
                 ports.append(ports)
         if len(interfaces) == 0:
             sys.exit('Configuration error. Must have settings for http and/or https')
-        
+
         password = config['password']
         if not password == '<recycle>':
             from gluon import main
             for port in ports:
                 main.save_password(password, port)
-                
+
             password = '<recycle>'
-            
+
         args.append('-a "%s"' % password)
-        
+
         interfaces = ';'.join(interfaces)
         args.append('--interfaces=%s' % interfaces)
-        
+
         if 'log_filename' in config.key():
             log_filename = config['log_filename']
             args.append('--log_filename=%s' % log_filename)
-        
+
         return (args, config)
-    
+
     def start(self):
         pass
-        
+
     def stop(self):
         pass
-        
+
     def restart(self):
         pass
-        
+
     def status(self):
         pass
-        
+
     def run(self):
         pass
-        
+
     def install(self):
         pass
-        
+
     def uninstall(self):
         pass
-        
+
     def check_permissions(self):
         """
         Does the script have permissions to install, uninstall, start, and stop services?
         Return value must be a tuple (True/False, error_message_if_False).
         """
         return (False, 'Permissions check not implemented')
-        
+
 class WebServerBase(Base):
     def install(self):
         pass
-        
+
     def uninstall(self):
         pass
-        
+
 
 def get_service():
     service_name = 'web2py'
     service_label = 'web2py Service'
-    
+
     if sys.platform == 'linux2':
-        from linux import LinuxService as Service            
+        from linux import LinuxService as Service
     elif sys.platform == 'darwin':
         # from mac import MacService as Service
         sys.exit('Mac OS X is not yet supported.\n')
@@ -148,16 +148,16 @@ def get_service():
         sys.exit('Windows is not yet supported.\n')
     else:
         sys.exit('The following platform is not supported: %s.\n' % sys.platform)
-    
+
     service = Service(service_name, service_label)
     return service
-             
+
 if __name__ == '__main__':
     service = get_service()
     is_root, error_message = service.check_permissions()
     if not is_root:
         sys.exit(error_message)
-        
+
     if len(sys.argv) >= 2:
         command = sys.argv[1]
         if command == 'start':