updated commands

Author: lp1bp

manager.py

@@ -1,29 +1,45 @@
 #!/bin/python
+#local imports
+import modules.commands as commands
+from modules.worker import Worker
+from modules.service import Service
+#
 import logging as log
 from importlib import import_module
 import services
 import config
-from modules.worker import Worker
+
 
 LOG_FILENAME = 'python_manager.log'
 dynamic_imports = []
 worker = Worker()
 
-class Service():
-  def __init__(self, name):
-    self.name = name
-
 def __init__():
+  i = 0
   global dynamic_imports
   log.basicConfig(filename=LOG_FILENAME,level=log.DEBUG)
   for service in config.run.keys():
-    dynamic_imports.append(import_module('services.%s' %service))    
-
+    dynamic_imports.append(import_module('services.%s' %service))
+  for service_name in config.run.keys():
+    worker.add(Service(service_name, i))
+    i += 1
+    
+def handle_input(command):
+  command = command.strip()
+  command = command.split(" ")
+  if command[0] not in commands.commands:
+    commands.help(worker, command)
+  else:
+    output = eval("commands.%s" %command[0])(worker, command)
+    if output is not None:
+      return False
+  return True
+    
 def	main():
   __init__()
-  for service_name in config.run.keys():
-    worker.add(Service(service_name))
   worker.start()
+  while handle_input(input()) is True:
+    continue
   log.info('All tasks done. Stopping')
   return 0
 

modules/commands.py

@@ -0,0 +1,18 @@
+commands = ["quit", "list"]
+
+def quit(worker, args=None):
+    return 0
+
+def help(worker, args=None):
+    command = args[0]
+    print("%s not in commands : %s" %(command, commands))
+
+def list(worker, args=None):
+    i = 0
+    for thread in worker.threads:
+        service = worker.get_service(i)
+        print("[%i] | %s | %s" %(service.id, thread, service.name))
+        i += 1
+
+def kill(worker, args=None):
+    worker.kill(int(args[1]))

modules/service.py

@@ -0,0 +1,13 @@
+import services
+
+class Service():
+    def __init__(self, name, id):
+        self.name = name
+        self.id = id
+
+    def run(self):
+        self.start()
+        
+    def start(self):
+        eval("services.%s.main()" %self.name)
+                

modules/worker.py

@@ -5,17 +5,23 @@ class Worker():
     def __init__(self):
         self.threads = []
         self.services = []
-        
-    def run_service(self, service):
-        eval("services.%s.main()" %service.name)
 
     def start(self):
         for service in self.services:
-            t = Thread(target=self.run_service, args=[service])
+            t = Thread(target=service.run, args=[])
             self.threads.append(t)
             t.start()
 
     def add(self, service):
         self.services.append(service)
-
 
+    def kill(self, id):
+        self.threads[id].interrupt_main()
+        self.services.pop(id)
+        self.threads.pop(id)
+
+    def get_service(self, id):
+        for service in self.services:
+            if service.id == id:
+                return service
+        return None