PYROS-IRAP / pyros

Commit 58f35996807e5d28489e9c769eebf0cd927ad86e

Authored by Unknown
1 parent a64f430a
Exists in dev

Fixing process bugs without celery

Showing 1 changed file with 6 additions and 5 deletions   Show diff stats
Inline Side-by-side
pyros.py
  Diff comments   View file @58f3599
... ... @@ -762,15 +762,15 @@ class Pyros(AManager):
762 762 return 0
763 763  
764 764 def kill_simulation(self):
765   - self.changeDirectory("src")
  765 + # self.changeDirectory("src")
766 766 self.replacePatternInFile("CELERY_TEST = True", "CELERY_TEST = False", "pyros/settings.py")
767 767 self.replacePatternInFile("SIMULATOR = True", "SIMULATOR = False", "pyros/settings.py")
768 768 if (self.system == "Windows"):
769 769 self.execProcessAsync("taskkill /f /im python.exe")
770   - self.execProcessAsync("del /f testdb.sqlite3")
771   - self.changeDirectory("..")
  770 + #self.execProcessAsync("del /f testdb.sqlite3") obsolete
  771 + #self.changeDirectory("..") POURQUOI ?
772 772 return 0
773   - else: self.execProcessAsync("rm -f testdb.sqlite3")
  773 + #else: self.execProcessAsync("rm -f testdb.sqlite3")
774 774  
775 775 # Kill web server (processes using TCP port 8000) :
776 776 #self.execProcessAsync("fuser -k 8000/tcp")
... ... @@ -781,7 +781,7 @@ class Pyros(AManager):
781 781 self.execProcessAsync("ps aux | grep \"start_agent_alert_manager.py\" | awk '{ print $2 }' | xargs kill")
782 782 self.execProcessAsync("ps aux | grep \"start_agent_monitoring.py\" | awk '{ print $2 }' | xargs kill")
783 783 self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
784   -
  784 + #self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
785 785 # Kill all simulators :
786 786 self.execProcessAsync("ps aux | grep \" domeSimulator.py\" | awk '{ print $2 }' | xargs kill")
787 787 self.execProcessAsync("ps aux | grep \" userSimulator.py\" | awk '{ print $2 }' | xargs kill")
... ... @@ -792,6 +792,7 @@ class Pyros(AManager):
792 792 self.execProcessAsync("ps aux | grep \" cameraVISSimulator.py\" | awk '{ print $2 }' | xargs kill")
793 793 self.changeDirectory("..")
794 794 self.stop_workers()
  795 +
795 796 self.printFullTerm(Colors.GREEN, "simulation ended")
796 797 return 0
797 798  
... ...