]> git.ipfire.org Git - people/jschlag/pbs.git/commitdiff
builders: Catch problems when the database returned nothing.
authorMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Dec 2012 15:23:46 +0000 (16:23 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Fri, 21 Dec 2012 15:23:46 +0000 (16:23 +0100)
backend/builders.py

index e132d404837febe50e59e57e7503913cdc8bf0de..fd3eace8a8c468850987fb7e46145dc69692a850 100644 (file)
@@ -73,15 +73,14 @@ class Builders(base.Object):
        def get_load(self):
                res1 = self.db.get("SELECT SUM(max_jobs) AS max_jobs FROM builders \
                        WHERE status = 'enabled'")
-               if not res1:
-                       return 0
 
                res2 = self.db.get("SELECT COUNT(*) AS count FROM jobs \
                        WHERE state = 'dispatching' OR state = 'running' OR state = 'uploading'")
-               if not res2:
-                       return 0
 
-               return (res2.count * 100 / res1.max_jobs)
+               try:
+                       return (res2.count * 100 / res1.max_jobs)
+               except:
+                       return 0
 
        def get_history(self, limit=None, offset=None, builder=None, user=None):
                query = "SELECT * FROM builders_history"