Increase code health

nir0s · Nov 23, 2016 · 1f76277 · 1f76277
1 parent 9bd8352
commit 1f76277
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 61 deletions.
diff --git a/serv/init/base.py b/serv/init/base.py
@@ -136,7 +136,7 @@ def uninstall(self):
         """
         # raise NotImplementedError('Must be implemented by a subclass')
 
-    def status(self, name=''):
+    def status(self, **kwargs):
         """Retrieve the status of a service `name` or all services
         for the current init system.
         """

diff --git a/serv/init/systemd.py b/serv/init/systemd.py
@@ -170,5 +170,5 @@ def is_system_exists():
     try:
         sh.systemctl('--version')
         return True
-    except:
+    except sh.CommandNotFound:
         return False
diff --git a/serv/init/sysv.py b/serv/init/sysv.py
@@ -55,7 +55,7 @@ def start(self):
                 service = sh.Command('/etc/init.d/{0}'.format(self.name))
                 service.start(_bg=True)
             except sh.CommandNotFound as ex:
-                raise ServError('Comnand not found: {0}'.format(ex))
+                raise ServError('Command not found: {0}'.format(ex))
         except:
             self.logger.info('Service already started.')
 
@@ -85,37 +85,6 @@ def status(self, name=''):
         """WIP!"""
         raise NotImplementedError()
 
-        super(SysV, self).status(name=name)
-        try:
-            sh.service(name, 'status')
-        except sh.CommandNotFound:
-            self.logger.warning(
-                'service command unavailable. Trying to run script directly')
-            try:
-                service = sh.Command('/etc/init.d/{0}'.format(self.name))
-            except sh.CommandNotFound as ex:
-                raise ServError('Command not found: {0}'.format(ex))
-        svc_info = self._parse_service_info(service.status())
-        self.services['services'] = svc_info
-        return self.services
-
-    @staticmethod
-    def _parse_service_info(svc):
-        # ssh start/running, process 1214
-        s = svc.split()
-        name = s[0]
-        last_action, status = s[1].split('/')
-        try:
-            pid = s[2].split()[1]
-        except:
-            pid = ''
-        return dict(
-            name=name,
-            last_action=last_action,
-            status=status,
-            pid=pid
-        )
-
     @staticmethod
     def is_system_exists():
         return is_system_exists()

diff --git a/serv/init/upstart.py b/serv/init/upstart.py
@@ -53,31 +53,7 @@ def uninstall(self):
             os.remove(self.svc_file_dest)
 
     def status(self, name=''):
-        super(Upstart, self).status(name=name)
-
-        svc_list = sh.initctl.list()
-        svcs_info = [self._parse_service_info(svc) for svc in svc_list]
-        if name:
-            # return list of one item for specific service
-            svcs_info = [s for s in svcs_info if s['name'] == name]
-        self.services['services'] = svcs_info
-        return self.services
-
-    @staticmethod
-    def _parse_service_info(svc):
-        s = svc.split()
-        name = s[0]
-        last_action, status = s[1].split('/')
-        try:
-            pid = s[2].split()[1]
-        except:
-            pid = ''
-        return dict(
-            name=name,
-            last_action=last_action,
-            status=status,
-            pid=pid
-        )
+        raise NotImplementedError()
 
     @staticmethod
     def is_system_exists():
@@ -96,5 +72,5 @@ def is_system_exists():
     try:
         sh.initctl.version()
         return True
-    except:
+    except sh.CommandNotFound:
         return False
diff --git a/serv/serv.py b/serv/serv.py
@@ -169,7 +169,7 @@ def status(self, name=''):
         init = self._get_implementation(name)
         if name:
             self._assert_service_installed(init, name)
-        logger.info('Retrieving status...'.format(name))
+        logger.info('Retrieving status...')
         return init.status(name)
 
     def stop(self, name):