Commit acebe04

committed

added 'reload' command

1 parent f14e552 commit acebe04Copy full SHA for acebe04

File tree

+29

-7

lines changed

+29

-7

lines changed

Lines changed: 2 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`#!/bin/python`
	`2`	`+`
`2`	`3`	`#local imports`
`3`	`4`	`from modules.worker import Worker`
`4`		`-from modules.service import Service`
`5`		`-from modules.utils import *`
`6`	`5`	`from modules.server import Server`
`7`	`6`	`from modules.commands import quit`
`8`	`7`	`#externam imports`
`@@ -19,10 +18,7 @@ def __init__():`
`19`	`18`	`global server`
`20`	`19`	`# log.basicConfig(filename=LOG_FILENAME,level=log.DEBUG)`
`21`	`20`	`log.basicConfig(level=log.DEBUG)`
`22`		`- check_config()`
`23`		`- for service_name in config.run.keys():`
`24`		`- service_conf = config.run[service_name]`
`25`		`- worker.add(Service(service_name, service_conf))`
	`21`	`+ worker.init()`
`26`	`22`	`server = Server(config.daemon, worker)`
`27`	`23`
`28`	`24`	`def main():`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-available_commands = ["quit", "list", "start", "kill", "status"]`
	`1`	`+available_commands = ["quit", "list", "start", "kill", "status", "restart"]`
`2`	`2`
`3`	`3`	`def handle_input(command, worker, server=None):`
`4`	`4`	`command = command.strip()`
`@@ -10,6 +10,10 @@ def handle_input(command, worker, server=None):`
`10`	`10`	`output = eval("%s" %command[0])(worker, command, server)`
`11`	`11`	`return True, output`
`12`	`12`
	`13`	`+def restart(worker, args=None, server=None):`
	`14`	`+ worker.restart()`
	`15`	`+ return "Worker restarted"`
	`16`	`+`
`13`	`17`	`def quit(worker, args=None, server=None):`
`14`	`18`	`print("Quitting server")`
`15`	`19`	`server.stop()`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,8 @@`
	`1`	`+from modules.utils import check_config`
	`2`	`+from modules.service import Service`
	`3`	`+from importlib import reload`
`1`	`4`	`import logging as log`
	`5`	`+import config`
`2`	`6`
`3`	`7`	`class Worker():`
`4`	`8`	`def __init__(self):`
`@@ -17,6 +21,24 @@ def start(self):`
`17`	`21`	`log.info("Starting service %s" %service.name)`
`18`	`22`	`service.start()`
`19`	`23`
	`24`	`+ def init(self):`
	`25`	`+ self.__init__()`
	`26`	`+ check_config()`
	`27`	`+ for service_name in config.run.keys():`
	`28`	`+ service_conf = config.run[service_name]`
	`29`	`+ self.add(Service(service_name, service_conf))`
	`30`	`+ return`
	`31`	`+`
	`32`	`+ def stop(self):`
	`33`	`+ for service in self.services:`
	`34`	`+ self.kill(service.id)`
	`35`	`+`
	`36`	`+ def restart(self):`
	`37`	`+ self.stop()`
	`38`	`+ reload(config)`
	`39`	`+ self.init()`
	`40`	`+ self.start()`
	`41`	`+`
`20`	`42`	`def add(self, service):`
`21`	`43`	`log.info("Added service %s" %service.name)`
`22`	`44`	`self.lastId += 1`

Comments

(0)