added git repository handling

Author: lp1tek

daemon.py

@@ -18,8 +18,8 @@ def __init__():
   global server
   #  log.basicConfig(filename=LOG_FILENAME,level=log.DEBUG)
   log.basicConfig(level=log.DEBUG)
-  worker.init()
   server = Server(config.daemon, worker)
+  worker.init(server)
 
 def	main():
   __init__()

modules/commands.py

@@ -1,4 +1,4 @@
-available_commands = ["quit", "list", "start", "kill", "status", "restart"]
+available_commands = ["quit", "list", "start", "kill", "status", "restart", "clear"]
 
 def handle_input(command, worker, server=None):
   command = command.strip()
@@ -13,6 +13,9 @@ def handle_input(command, worker, server=None):
 def restart(worker, args=None, server=None):
   worker.restart()
   return "Worker restarted"
+
+def clear(worker, args=None, server=None):
+  return "\033[H\033[2J"
 
 def quit(worker, args=None, server=None):
   print("Quitting server")

modules/server.py

@@ -13,10 +13,12 @@ def __init__(self, config, worker):
         self.BUFFER_SIZE = 1024
         self.worker = worker
         self.hello = "### Python Manager\nHello !\n#> "
-
+        self.socket = None
+        
     def start(self):
         print("Server starting")
         self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         self.socket.bind((self.host, self.port))
         self.socket.listen(5)
         self.inputs.append(self.socket)
@@ -46,4 +48,17 @@ def start(self):
 
     def stop(self):    
         print("Exiting...")
-        self.socket.close()
+        if self.socket is not None:
+            try:
+                self.socket.shutdown(socket.SHUT_RDWR)
+            except OSError as e:
+                pass
+            self.socket.close()
+
+    def restart(self):
+        print("Restarting...")
+        if self.socket is not None:
+            self.socket.shutdown(socket.SHUT_RDWR)
+            self.socket.close()
+        self.__init__(self.config, self.worker)
+        self.stop()

modules/service.py

@@ -1,24 +1,47 @@
 from importlib import import_module
 from multiprocessing import Process
 from os import getcwd, chdir
-import run
+from modules.utils import git_clone
 from sys import path
+from time import sleep
+import run
+import sys
+import os
+import logging as log
+import config
 
 class Service():
-    def __init__(self, service_name, service_conf):
+    def __init__(self, service_name, service_conf, server):
         self.name = service_name
         self.directory = service_conf['directory']
+        self.services_directory = config.daemon['services_directory']
         self.keepAlive = service_conf['restart']
         self.main_method = service_conf['main_method']
+        self.repository = None
+        if "repository" in service_conf.keys():
+            self.repository = service_conf['repository']
         self.process = Process(target=self.run, args=[])
-
+        self.server = server
+    
     def setId(self, id):
         self.id = id
 
     def run(self):
-        path.insert(0, getcwd()+"/run/"+self.directory)
-        import_module("run.%s.%s" %(self.directory, self.name))
-        command = "run.%s.%s.%s" %(self.directory, self.name, self.main_method)
+        try:
+            path.insert(0, getcwd()+"/%s/"%self.services_directory+self.directory)
+            import_module("%s.%s.%s" %(self.services_directory, self.directory, self.name))
+        except ImportError as e:
+            log.warn("Module %s not found" %self.name)
+            if self.repository is not None:
+                git_clone(self.repository, self.directory)
+                log.info("Successfully cloned %s. Restarting..." %self.repository)
+                self.server.restart()
+                sleep(2)
+                os.execv(sys.executable, ['python'] + sys.argv)
+                import_module("%s.%s.%s" %(self.services_directory, self.directory, self.name))
+            else:
+                log.err("The module %s is not found cannot be cloned from a repository")
+        command = "%s.%s.%s.%s" %(self.services_directory, self.directory, self.name, self.main_method)
         if self.keepAlive:
             while self.keepAlive:
                 eval(command)()

modules/utils.py

@@ -1,7 +1,8 @@
 import config
 import logging as log
 from sys import exit
-
+from git import Repo
+    
 def check_config():
     mandatory_in_services = ["restart", "directory", "main_method"]
     mandatory_in_daemon = ["host", "port"]
@@ -19,3 +20,7 @@ def check_config():
     except AttributeError as e:
         log.error("Your config.py hasn't a correct format : [%s]" %str(e))
         exit(-1)
+
+def git_clone(url, name):
+    Repo.clone_from(url, config.daemon['services_directory'] + "/" + name)
+

modules/worker.py

@@ -1,4 +1,4 @@
-from modules.utils import check_config
+from modules.utils import check_config, git_clone
 from modules.service import Service
 from importlib import reload
 import logging as log
@@ -21,12 +21,13 @@ def start(self):
             log.info("Starting service %s" %service.name)
             service.start()
 
-    def init(self):
+    def init(self, server):
         self.__init__()
+        self.server = server
         check_config()
         for service_name in config.run.keys():
             service_conf = config.run[service_name]
-            self.add(Service(service_name, service_conf))
+            self.add(Service(service_name, service_conf, self.server))
         return
 
     def stop(self):