summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <makefu@syntax-fehler.de>2011-06-30 23:38:47 +0200
committermakefu <makefu@syntax-fehler.de>2011-06-30 23:38:47 +0200
commitdf942da80db39b86664c2df0af3e68cc2e881f14 (patch)
tree3f4caf21047aacd4ba376926494739207ef456a2
parent21cf2eae73ea4ae2a63df512767480584073d232 (diff)
merged fixes from testing on monitoring.shack
check_btcguild_miner: tries json and then simplejson to import, fixes try-except block
-rwxr-xr-xMonitoring/plugins/check_btcguild_miner12
1 files changed, 9 insertions, 3 deletions
diff --git a/Monitoring/plugins/check_btcguild_miner b/Monitoring/plugins/check_btcguild_miner
index aacdefc9..102e73da 100755
--- a/Monitoring/plugins/check_btcguild_miner
+++ b/Monitoring/plugins/check_btcguild_miner
@@ -1,5 +1,11 @@
-#!/usr/bin/python2
-import json,urllib,datetime,sys
+#!/usr/bin/python
+import urllib,sys
+try:
+ import json
+ getattr(json,"load")
+except: #deal with it
+ import simplejson as json
+
if len(sys.argv) != 4 :
print "** Usage: %s APIKEY WORKER_NAME LOW_WORKER_SPEED" % sys.argv[0]
print "** aka YOU ARE MADE OF STUPID"
@@ -11,7 +17,7 @@ LOW_WORKER_SPEED=float(sys.argv[3])
url="http://www.btcguild.com/api.php?api_key=%s" % API_KEY
try:
result = json.load(urllib.urlopen(url))
-except e:
+except:
print "?? cannot parse json or connect to server"
exit (1)