added server interface for the daemon

Author: lp1tek

config.py

@@ -1,4 +1,8 @@
 run={
-    "hello_world":{"directory":"hello_world", "restart":False, "main_method":"main"},
-    "tester":{"directory":"proxy_tester", "restart":False, "main_method":"main"}
+    "hello_world":{"directory":"hello_world", "restart":False, "main_method":"main"}
+}
+
+daemon={
+    "port": 8889,
+    "host": "127.0.0.1"
 }

manager.py

@@ -1,25 +1,60 @@
-commands = ["quit", "list", "start", "kill"]
+available_commands = ["quit", "list", "start", "kill", "status"]
 
-def quit(worker, args=None):
-    return 0
+def handle_input(command, worker, server=None):
+  command = command.strip()
+  command = command.split(" ")
+  if command[0] not in available_commands:
+    return False, help(worker, command)
+  else:
+    print(command)
+    output = eval("%s" %command[0])(worker, command, server)
+    return True, output
 
-def help(worker, args=None):
-    command = args[0]
-    print("%s not in commands : %s" %(command, commands))
+def quit(worker, args=None, server=None):
+  print("Quitting server")
+  server.stop()                                                                                                                                              
+  print("Closing running services...")                                                                                                                       
+  for service in worker.services:
+    service.stop()
+  print("Goodbye !\n")
+  exit(0)
 
-def list(worker, args=None):
-    for service in worker.services:
-        print("[%i] | %s | Alive : %s" %(service.id, service.name, service.isAlive()))
+def help(worker, args=None, server=None):
+  command = args[0]
+  return ("%s not in commands : %s" %(command, available_commands))
 
-def start(worker, args=None):
+def status(worker, args=None, server=None):
+  if len(args) > 1:
+    id = int(args[1])
+    service = worker.getService(id)
+    if service is None:
+      return "There isn't such service"
+    return "[%i] | %s | Alive : %s" %(service.id, service.name, service.isAlive())
+  return "Invalid number of arguments"
+
+def list(worker, args=None, server=None):
+  strlist = ""
+  for service in worker.services:
+    strlist += "[%i] | %s | Alive : %s" %(service.id, service.name, service.isAlive())
+  return strlist
+
+def start(worker, args=None, server=None):
     if len(args) > 1:
         id = int(args[1])
         service = worker.getService(id)
+        if service is None:
+          return "There isn't such service"
         if not service.isAlive():
             service.restart()
+            return "service started"
         else:
             log.warning("Service %i is already running" %id)
-        
-def kill(worker, args=None):
+            return "Service is already running"
+    return "Invalid number of arguments"
+          
+def kill(worker, args=None, server=None):
     if len(args) > 1:
         worker.kill(int(args[1]))
+        return "Service killed"
+    return "Cannot find service"
+

modules/commands.py

@@ -25,6 +25,9 @@ def run(self):
     def start(self):
         self.process.start()
 
+    def stop(self):
+        self.process.terminate()
+
     def restart(self, process=None):
         if process is not None:
             self.process = process

modules/service.py

@@ -4,7 +4,11 @@
 
 def check_config():
     mandatory_in_services = ["restart", "directory", "main_method"]
+    mandatory_in_daemon = ["host", "port"]
     try:
+        for mandatory in mandatory_in_daemon:
+            if mandatory not in config.daemon.keys():
+                log.error("Your daemon configuration must containes the attributes %s. %s is missing" %(mandatory_in_daemon, mandatory))
         for service_name in config.run.keys():
             service_conf = config.run[service_name]
             for mandatory in mandatory_in_services:
@@ -15,4 +19,3 @@ def check_config():
     except AttributeError as e:
         log.error("Your config.py hasn't a correct format : [%s]" %str(e))
         exit(-1)
-

modules/utils.py

@@ -28,4 +28,4 @@ def kill(self, id):
         if service is None:
             log.warning("There is no service with id %i" %id)
             return
-        service.process.terminate()
+        service.stop()