Commit c5340e9

committed

went from Threads to Processes

1 parent c6096ed commit c5340e9Copy full SHA for c5340e9

File tree

+16

-14

lines changed

+16

-14

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
`1`	`1`	`run={`
`2`		`- "hello_world":{"directory":"hello_world", "restart":False, "main_method":"main"}`
	`2`	`+ "hello_world":{"directory":"hello_world", "restart":False, "main_method":"main"},`
	`3`	`+ "tester":{"directory":"proxy_tester", "restart":False, "main_method":"main"}`
`3`	`4`	`}`

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-commands = ["quit", "list", "start"]`
	`1`	`+commands = ["quit", "list", "start", "kill"]`
`2`	`2`
`3`	`3`	`def quit(worker, args=None):`
`4`	`4`	`return 0`
`@@ -21,4 +21,5 @@ def start(worker, args=None):`
`21`	`21`	`log.warning("Service %i is already running" %id)`
`22`	`22`
`23`	`23`	`def kill(worker, args=None):`
`24`		`- worker.kill(int(args[1]))`
	`24`	`+ if len(args) > 1:`
	`25`	`+ worker.kill(int(args[1]))`

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`from importlib import import_module`
`2`		`-from threading import Thread`
	`2`	`+from multiprocessing import Process`
`3`	`3`	`import run`
`4`	`4`
`5`	`5`	`class Service():`
`@@ -8,7 +8,7 @@ def __init__(self, service_name, service_conf):`
`8`	`8`	`self.directory = service_conf['directory']`
`9`	`9`	`self.keepAlive = service_conf['restart']`
`10`	`10`	`self.main_method = service_conf['main_method']`
`11`		`- self.thread = Thread(target=self.run, args=[])`
	`11`	`+ self.process = Process(target=self.run, args=[])`
`12`	`12`
`13`	`13`	`def setId(self, id):`
`14`	`14`	`self.id = id`
`@@ -23,14 +23,14 @@ def run(self):`
`23`	`23`	`eval(command)()`
`24`	`24`
`25`	`25`	`def start(self):`
`26`		`- self.thread.start()`
	`26`	`+ self.process.start()`
`27`	`27`
`28`		`- def restart(self, thread=None):`
`29`		`- if thread is not None:`
`30`		`- self.thread = thread`
	`28`	`+ def restart(self, process=None):`
	`29`	`+ if process is not None:`
	`30`	`+ self.process = process`
`31`	`31`	`else:`
`32`		`- self.thread = Thread(target=self.run, args=[])`
`33`		`- self.thread.start()`
	`32`	`+ self.process = Process(target=self.run, args=[])`
	`33`	`+ self.process.start()`
`34`	`34`
`35`	`35`	`def isAlive(self):`
`36`		`- return self.thread.isAlive()`
	`36`	`+ return self.process.is_alive()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ def add(self, service):`
`24`	`24`	`self.services.append(service)`
`25`	`25`
`26`	`26`	`def kill(self, id):`
`27`		`- service = self.get_service(id)`
	`27`	`+ service = self.getService(id)`
`28`	`28`	`if service is None:`
`29`	`29`	`log.warning("There is no service with id %i" %id)`
`30`	`30`	`return`
`31`		`- service.kill()`
	`31`	`+ service.process.terminate()`

Comments

(0)