less pollution in logs, longer timeouts

diff --git a/system/TestPlc.py b/system/TestPlc.py
index f7b6842..d979e4f 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -728,9 +728,9 @@ class TestPlc:
         return True
 
     def nodes_booted(self):
-        return self.nodes_check_boot_state('boot',timeout_minutes=20,silent_minutes=15)
+        return self.nodes_check_boot_state('boot',timeout_minutes=30,silent_minutes=20)
 
-    def check_nodes_ssh(self,debug,timeout_minutes,silent_minutes,period=20):
+    def check_nodes_ssh(self,debug,timeout_minutes,silent_minutes,period=15):
         # compute timeout
         timeout = datetime.datetime.now()+datetime.timedelta(minutes=timeout_minutes)
         graceout = datetime.datetime.now()+datetime.timedelta(minutes=silent_minutes)

diff --git a/system/Trackers.py b/system/Trackers.py
index 257c033..93b917a 100644 (file)
--- a/system/Trackers.py
+++ b/system/Trackers.py
@@ -64,6 +64,7 @@ class Tracker:
         to_stop = self.tracks[:how_many]
         for track in to_stop:
             command = self.stop_command (track)
+            utils.header("Trackers.free track : %s"%command)
             utils.system(command)
         if not self.options.dry_run:
             self.tracks = self.tracks[how_many:]
@@ -72,6 +73,7 @@ class Tracker:
     def cleanup (self):
         for track in self.tracks:
             command=self.stop_command(track)
+            utils.header("Trackers.cleanup track : %s"%command)
             utils.system(command)
         if not self.options.dry_run:
             self.tracks=[]

diff --git a/system/utils.py b/system/utils.py
index e6700f1..22eb885 100644 (file)
--- a/system/utils.py
+++ b/system/utils.py
@@ -27,7 +27,8 @@ def system(command,background=False):
         return 0
     else:
         now=time.strftime("%H:%M:%S", time.localtime())
-        print "*",now,'--',
+        # don't show in summary
+        print "->",now,'--',
         sys.stdout.flush()
         return os.system("set -x; " + command)