ahamilton/eris
1
0
Fork 0
Code Releases Activity

Coding style.

Browse source 
Moved the Result class into tools, which simplifies worker.py and makes the
circular import problem go away.
This commit is contained in:
Andrew Hamilton 2016-02-13 18:48:53 +00:00
parent cc95534bd7
commit 2373e78cbd
5 changed files with 151 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

5
worker.py
View file

@ -10,7 +10,6 @@ import subprocess
import psutil
import tools
import vigil
def make_process_nicest(pid):
@ -28,7 +27,7 @@ class Worker:
[__file__], stdin=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
else:
cache_path = os.path.join(os.getcwd(), vigil._CACHE_PATH)
cache_path = os.path.join(os.getcwd(), tools._CACHE_PATH)
self.cache_mount = sandbox.mount_point + cache_path
subprocess.check_call(["sudo", "mount", "--bind", cache_path,
self.cache_mount])
@ -54,7 +53,7 @@ def main():
while True:
tool_name, path = input(), input()
tool = getattr(tools, tool_name)
result = vigil.Result(path, tool)
result = tools.Result(path, tool)
status, result.result = tools.run_tool_no_error(path, tool)
print(status.value, flush=True)