diff --git a/pyros.py b/pyros.py index f3dc83e..046f0ae 100755 --- a/pyros.py +++ b/pyros.py @@ -762,15 +762,15 @@ class Pyros(AManager): return 0 def kill_simulation(self): - self.changeDirectory("src") + # self.changeDirectory("src") self.replacePatternInFile("CELERY_TEST = True", "CELERY_TEST = False", "pyros/settings.py") self.replacePatternInFile("SIMULATOR = True", "SIMULATOR = False", "pyros/settings.py") if (self.system == "Windows"): self.execProcessAsync("taskkill /f /im python.exe") - self.execProcessAsync("del /f testdb.sqlite3") - self.changeDirectory("..") + #self.execProcessAsync("del /f testdb.sqlite3") obsolete + #self.changeDirectory("..") POURQUOI ? return 0 - else: self.execProcessAsync("rm -f testdb.sqlite3") + #else: self.execProcessAsync("rm -f testdb.sqlite3") # Kill web server (processes using TCP port 8000) : #self.execProcessAsync("fuser -k 8000/tcp") @@ -781,7 +781,7 @@ class Pyros(AManager): self.execProcessAsync("ps aux | grep \"start_agent_alert_manager.py\" | awk '{ print $2 }' | xargs kill") self.execProcessAsync("ps aux | grep \"start_agent_monitoring.py\" | awk '{ print $2 }' | xargs kill") self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill") - + #self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill") # Kill all simulators : self.execProcessAsync("ps aux | grep \" domeSimulator.py\" | awk '{ print $2 }' | xargs kill") self.execProcessAsync("ps aux | grep \" userSimulator.py\" | awk '{ print $2 }' | xargs kill") @@ -792,6 +792,7 @@ class Pyros(AManager): self.execProcessAsync("ps aux | grep \" cameraVISSimulator.py\" | awk '{ print $2 }' | xargs kill") self.changeDirectory("..") self.stop_workers() + self.printFullTerm(Colors.GREEN, "simulation ended") return 0 -- libgit2 0.21.2