Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

Fix getenv usage in swift plugins

Browse Source 
os.getenv returns a string, not an integer, so using %s will fail if the
variable SWIFT_OBJECT_PORT is set.
This commit is contained in:
Julien Danjou 2013-05-17 10:36:29 +02:00
parent dc75b52a7d
commit 1e1ca5b633
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/swift/swift-async_
View File

@ -43,6 +43,6 @@ try:
except IndexError:
pass
async_r = requests.get("http://%s:%d/recon/async" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", 6000)))
async_r = requests.get("http://%s:%s/recon/async" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", "6000")))
print "async_pending.value %d" % json.loads(async_r.text)['async_pending']

4
plugins/swift/swift-quarantined_
View File

@ -49,8 +49,8 @@ try:
except IndexError:
pass
quarantined = json.loads(requests.get("http://%s:%d/recon/quarantined" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", 6000))).text)
quarantined = json.loads(requests.get("http://%s:%s/recon/quarantined" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", "6000"))).text)
print "quarantined_objects.value %d" % quarantined['objects']
print "quarantined_containers.value %d" % quarantined['containers']
print "quarantined_accounts.value %d" % quarantined['accounts']

4
plugins/swift/swift-replication-time_
View File

@ -43,6 +43,6 @@ try:
except IndexError:
pass
replication_r = requests.get("http://%s:%d/recon/replication" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", 6000)))
replication_r = requests.get("http://%s:%s/recon/replication" \
% (swift_server, os.getenv("SWIFT_OBJECT_PORT", "6000")))
print "object_replication_time.value %f" % json.loads(replication_r.text)['object_replication_time']