cleanup for pep8

ranman · Jul 9, 2012 · cba6116 · cba6116
1 parent 08e7aeb
commit cba6116
Show file tree

Hide file tree

Showing 13 changed files with 57 additions and 101 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,3 @@
-
 Munin Plugins for MongoDB
 ============
 
@@ -8,12 +7,9 @@ Plugins
 * mongo_mem   : mapped, virtual and resident memory usage
 * mongo_btree : btree access/misses/etc...
 * mongo_conn  : current connections
-* mongo_lock  : write lock info  
+* mongo_lock  : write lock info
 
 Requirements
 -----------
 * simplejson or python >= 2.6
 * MongoDB 1.4+ 
-
-
-
diff --git a/mongo_btree b/mongo_btree
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 ## GENERATED FILE - DO NOT EDIT
-
 import urllib2
 import sys
 import os
@@ -21,19 +20,23 @@ def getServerStatus():
     password = os.environ.get("password")
     if user and password:
         passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
+        passwdmngr.add_password(None, 'http://%s:%d' % (host, port),
+                                user, password)
         authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
         opener = urllib2.build_opener(authhandler)
         urllib2.install_opener(opener)
     raw = urllib2.urlopen(req).read()
-    return json.loads( raw )["serverStatus"]
+    return json.loads(raw)["serverStatus"]
+
 
 def get():
     return getServerStatus()["indexCounters"]["btree"]
 
+
 def doData():
-    for k,v in get().iteritems():
-        print( str(k) + ".value " + str(int(v)) )
+    for k, v in get().iteritems():
+        print(str(k) + ".value " + str(int(v)))
+
 
 def doConfig():
 
@@ -49,15 +52,8 @@ def doConfig():
         print k + ".max 500000"
         print k + ".draw LINE1"
 
-
-
-
-
-
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "config":
         doConfig()
     else:
         doData()
-
-
diff --git a/mongo_conn b/mongo_conn
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 ## GENERATED FILE - DO NOT EDIT
-
 import urllib2
 import sys
 import os
@@ -21,18 +20,20 @@ def getServerStatus():
     password = os.environ.get("password")
     if user and password:
         passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
+        passwdmngr.add_password(None, 'http://%s:%d' % (host, port),
+                                user, password)
         authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
         opener = urllib2.build_opener(authhandler)
         urllib2.install_opener(opener)
     raw = urllib2.urlopen(req).read()
-    return json.loads( raw )["serverStatus"]
+    return json.loads(raw)["serverStatus"]
 
 name = "connections"
 
 
 def doData():
-    print name + ".value " + str( getServerStatus()["connections"]["current"] )
+    print name + ".value " + str(getServerStatus()["connections"]["current"])
+
 
 def doConfig():
 
@@ -43,15 +44,8 @@ def doConfig():
 
     print name + ".label " + name
 
-
-
-
-
-
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "config":
         doConfig()
     else:
         doData()
-
-
diff --git a/mongo_lock b/mongo_lock
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 ## GENERATED FILE - DO NOT EDIT
-
 import urllib2
 import sys
 import os
@@ -21,36 +20,31 @@ def getServerStatus():
     password = os.environ.get("password")
     if user and password:
         passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
+        passwdmngr.add_password(None, 'http://%s:%d' % (host, port),
+                                user, password)
         authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
         opener = urllib2.build_opener(authhandler)
         urllib2.install_opener(opener)
     raw = urllib2.urlopen(req).read()
-    return json.loads( raw )["serverStatus"]
+    return json.loads(raw)["serverStatus"]
 
 name = "locked"
 
+
 def doData():
-    print name + ".value " + str( 100 * getServerStatus()["globalLock"]["ratio"] )
+    print name + ".value " + str(100 * getServerStatus()["globalLock"]["ratio"])
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB write lock percentage"
     print "graph_args --base 1000 -l 0 "
     print "graph_vlabel percentage"
     print "graph_category MongoDB"
 
     print name + ".label " + name
 
-
-
-
-
-
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "config":
         doConfig()
     else:
         doData()
-
-
diff --git a/mongo_mem b/mongo_mem
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 ## GENERATED FILE - DO NOT EDIT
-
 import urllib2
 import sys
 import os
@@ -21,42 +20,37 @@ def getServerStatus():
     password = os.environ.get("password")
     if user and password:
         passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
+        passwdmngr.add_password(None, 'http://%s:%d' % (host, port),
+                                user, password)
         authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
         opener = urllib2.build_opener(authhandler)
         urllib2.install_opener(opener)
     raw = urllib2.urlopen(req).read()
-    return json.loads( raw )["serverStatus"]
+    return json.loads(raw)["serverStatus"]
+
 
 def ok(s):
     return s == "resident" or s == "virtual" or s == "mapped"
 
+
 def doData():
-    for k,v in getServerStatus()["mem"].iteritems():
+    for k, v in getServerStatus()["mem"].iteritems():
         if ok(k):
-            print( str(k) + ".value " + str(v * 1024 * 1024) )
+            print(str(k) + ".value " + str(v * 1024 * 1024))
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB memory usage"
     print "graph_args --base 1024 -l 0 --vertical-label Bytes"
     print "graph_category MongoDB"
 
     for k in getServerStatus()["mem"]:
-        if ok( k ):
+        if ok(k):
             print k + ".label " + k
             print k + ".draw LINE1"
 
-
-
-
-
-
-
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "config":
         doConfig()
     else:
         doData()
-
-
diff --git a/mongo_ops b/mongo_ops
@@ -1,7 +1,6 @@
 #!/usr/bin/env python
 
 ## GENERATED FILE - DO NOT EDIT
-
 import urllib2
 import sys
 import os
@@ -21,21 +20,22 @@ def getServerStatus():
     password = os.environ.get("password")
     if user and password:
         passwdmngr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        passwdmngr.add_password(None, 'http://%s:%d' % (host, port), user, password)
+        passwdmngr.add_password(None, 'http://%s:%d' % (host, port),
+                                user, password)
         authhandler = urllib2.HTTPDigestAuthHandler(passwdmngr)
         opener = urllib2.build_opener(authhandler)
         urllib2.install_opener(opener)
     raw = urllib2.urlopen(req).read()
-    return json.loads( raw )["serverStatus"]
+    return json.loads(raw)["serverStatus"]
 
 
 def doData():
     ss = getServerStatus()
-    for k,v in ss["opcounters"].iteritems():
-        print( str(k) + ".value " + str(v) )
+    for k, v in ss["opcounters"].iteritems():
+        print(str(k) + ".value " + str(v))
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB ops"
     print "graph_args --base 1000 -l 0"
     print "graph_vlabel ops / ${graph_period}"
@@ -54,5 +54,3 @@ if __name__ == "__main__":
         doConfig()
     else:
         doData()
-
-
diff --git a/src/body_btree.py b/src/body_btree.py
@@ -1,10 +1,13 @@
 
+
 def get():
     return getServerStatus()["indexCounters"]["btree"]
 
+
 def doData():
-    for k,v in get().iteritems():
-        print( str(k) + ".value " + str(int(v)) )
+    for k, v in get().iteritems():
+        print(str(k) + ".value " + str(int(v)))
+
 
 def doConfig():
 
@@ -19,8 +22,3 @@ def doConfig():
         print k + ".type COUNTER"
         print k + ".max 500000"
         print k + ".draw LINE1"
-
-
-
-
-
diff --git a/src/body_conn.py b/src/body_conn.py
@@ -3,7 +3,8 @@
 
 
 def doData():
-    print name + ".value " + str( getServerStatus()["connections"]["current"] )
+    print name + ".value " + str(getServerStatus()["connections"]["current"])
+
 
 def doConfig():
 
@@ -13,8 +14,3 @@ def doConfig():
     print "graph_category MongoDB"
 
     print name + ".label " + name
-
-
-
-
-
diff --git a/src/body_lock.py b/src/body_lock.py
@@ -1,19 +1,15 @@
 
 name = "locked"
 
+
 def doData():
-    print name + ".value " + str( 100 * getServerStatus()["globalLock"]["ratio"] )
+    print name + ".value " + str(100 * getServerStatus()["globalLock"]["ratio"])
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB write lock percentage"
     print "graph_args --base 1000 -l 0 "
     print "graph_vlabel percentage"
     print "graph_category MongoDB"
 
     print name + ".label " + name
-
-
-
-
-
diff --git a/src/body_mem.py b/src/body_mem.py
@@ -1,25 +1,21 @@
 
+
 def ok(s):
     return s == "resident" or s == "virtual" or s == "mapped"
 
+
 def doData():
-    for k,v in getServerStatus()["mem"].iteritems():
+    for k, v in getServerStatus()["mem"].iteritems():
         if ok(k):
-            print( str(k) + ".value " + str(v * 1024 * 1024) )
+            print(str(k) + ".value " + str(v * 1024 * 1024))
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB memory usage"
     print "graph_args --base 1024 -l 0 --vertical-label Bytes"
     print "graph_category MongoDB"
 
     for k in getServerStatus()["mem"]:
-        if ok( k ):
+        if ok(k):
             print k + ".label " + k
             print k + ".draw LINE1"
-
-
-
-
-
-
diff --git a/src/body_ops.py b/src/body_ops.py
@@ -2,11 +2,11 @@
 
 def doData():
     ss = getServerStatus()
-    for k,v in ss["opcounters"].iteritems():
-        print( str(k) + ".value " + str(v) )
+    for k, v in ss["opcounters"].iteritems():
+        print(str(k) + ".value " + str(v))
 
-def doConfig():
 
+def doConfig():
     print "graph_title MongoDB ops"
     print "graph_args --base 1000 -l 0"
     print "graph_vlabel ops / ${graph_period}"

diff --git a/src/footer.py b/src/footer.py
@@ -4,5 +4,3 @@
         doConfig()
     else:
         doData()
-
-