Commit 590c6b2

committed

changed directory management

1 parent 93980c6 commit 590c6b2Copy full SHA for 590c6b2

File tree

+17

-11

lines changed

+17

-11

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`run={`
`2`		`- "hello_world":{}`
	`2`	`+ "hello_world":{"directory":"hello_world", "restart":True}`
`3`	`3`	`}`

Lines changed: 1 addition & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,22 +6,17 @@`
`6`	`6`	`#`
`7`	`7`	`import logging as log`
`8`	`8`	`from importlib import import_module`
`9`		`-import services`
`10`	`9`	`import config`
`11`	`10`
`12`		`-`
`13`	`11`	`LOG_FILENAME = 'python_manager.log'`
`14`		`-dynamic_imports = []`
`15`	`12`	`worker = Worker()`
`16`	`13`
`17`	`14`	`def __init__():`
`18`	`15`	`i = 0`
`19`	`16`	`global dynamic_imports`
`20`	`17`	`log.basicConfig(filename=LOG_FILENAME,level=log.DEBUG)`
`21`		`- for service in config.run.keys():`
`22`		`- dynamic_imports.append(import_module('services.%s' %service))`
`23`	`18`	`for service_name in config.run.keys():`
`24`		`- worker.add(Service(service_name, i))`
	`19`	`+ worker.add(Service(service_name, config.run[service_name]['directory'], i))`
`25`	`20`	`i += 1`
`26`	`21`
`27`	`22`	`def handle_input(command):`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,17 @@`
`1`		`-import services`
	`1`	`+from importlib import import_module`
	`2`	`+import run`
`2`	`3`
`3`	`4`	`class Service():`
`4`		`- def __init__(self, name, id):`
	`5`	`+ def __init__(self, name, directory, id):`
`5`	`6`	`self.name = name`
	`7`	`+ self.directory = directory`
`6`	`8`	`self.id = id`
`7`	`9`
`8`	`10`	`def run(self):`
`9`	`11`	`self.start()`
`10`	`12`
`11`	`13`	`def start(self):`
`12`		`- eval("services.%s.main()" %self.name)`
	`14`	`+ import_module("run.%s.%s" %(self.directory, self.name))`
	`15`	`+ command = "run.%s.%s.main()" %(self.directory, self.name)`
	`16`	`+ eval(command)`
`13`	`17`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`from threading import Thread`
`2`		`-import services`
`3`	`2`
`4`	`3`	`class Worker():`
`5`	`4`	`def __init__(self):`

Lines changed: 8 additions & 0 deletions

Comments

(0)