1 files changed, 13 insertions, 11 deletions
diff --git a/Monitoring/plugins/check_speed b/Monitoring/plugins/check_speed
index 8c2975cd..14a5b612 100755
--- a/Monitoring/plugins/check_speed
+++ b/Monitoring/plugins/check_speed
@@ -1,12 +1,12 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
-#TODO check_speed is nearly the same as check_temper, consolidate both scripts, probably by giving HIGH:LOW as params
+#TODO check_speed is nearly the same as check_speeder, consolidate both scripts, probably by giving HIGH:LOW as params
 import sys
 import urllib
 
 if len(sys.argv) < 2 or '-h' in sys.argv: 
-  print ("usage: %s URL [low-mhashes] ..." % sys.argv[0])
-  print ("  Server reply should look like this: '2011-07-11T09:00 400.0'")
+  print ("?? usage: %s URL [low-mhashes] ..." % sys.argv[0])
+  print ("??   Server reply should look like this: '2011-07-11T09:00 400.0'")
   exit(3)
 
 URL=sys.argv[1]
@@ -16,17 +16,19 @@ ecode=0
 try:
   ret = urllib.urlopen(URL).read().split()
   date = ret[0]
-  temps = [float(i) for i in ret[1:]]
-  if len(temps) != len(thresholds):
-    raise Exception("Number of temps != number of given thresholds")
-  for i,temp in enumerate(temps):
-    if temp < thresholds[i]:
-      print ("Warning: %.2f Mhash < %.2f Mhash ! (field %d)" %(temp,thresholds[i],i))
+  speeds = [float(i) for i in ret[1:]]
+  print ("** %s : %s Mhashes" % (date,' '.join([str(i) for i in speeds])))
+  if len(speeds) != len(thresholds):
+    raise Exception("!! Number of speeds != number of given thresholds")
+  for i,speed in enumerate(speeds):
+    if speed < thresholds[i]:
+      print ("!! %.2f Mhash < %.2f Mhash ! (field %d)" %(speed,thresholds[i],i))
       ecode=2
 except Exception,e:
   print("!! Something aweful happened: "+str(e))
   exit (1)
+#TODO return WARNING if date is too old
 if not ecode:
-  print ("Success: Everything is fine!")
-print ("Info: %s Current Mhash: %s" % (date,' '.join([str(i) for i in temps])))
+  print ("** Everything is fine!")
+
 exit(ecode)