Let's hope nobody reads THAT commit!

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index d3777a273971cd67e36314c907dee404779a5760..98c80f0af85dd0b50bcbed1e6e8b856b80a2d11e 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -222,6 +222,7 @@ def header():
 
 def footer():
     print "<p class=\"timestamp\">Timestamp: %s (UTC)</p>" % (time.strftime("%d.%m.%Y / %H:%M:%S", time.gmtime()))
+    print "<p class=\"timestamp\">There are <a href=\"/stat.html\">graphs about the queues</a> available.</p>"
 
     print """
     <div class="footer">
@@ -350,15 +351,17 @@ RRA:MAX:0.5:6:700
 RRA:MAX:0.5:24:775
 RRA:MAX:0.5:288:795
 """.strip().split("\n")
-        rrdtool.create(*create)
-        rrdtool.update(*update)
+        try:
+            rc = rrdtool.create(*create)
+            ru = rrdtool.update(*update)
+        except rrdtool.error, e:
+            print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass
 
 ############################################################
 
 def process_changes_files(changes_files, type, log, rrd_dir):
-    #session = DBConn().session()
     msg = ""
     cache = {}
     # Read in all the .changes files
@@ -431,7 +434,9 @@ def process_changes_files(changes_files, type, log, rrd_dir):
         for j in i[1]["list"]:
             changesbase = os.path.basename(j["filename"])
             try:
+                session = DBConn().session()
                 dbc = session.query(DBChange).filter_by(changesname=changesbase).one()
+                session.close()
             except Exception, e:
                 print "Can't find changes file in NEW for %s (%s)" % (changesbase, e)
                 dbc = None
@@ -649,17 +654,6 @@ def main():
     if Cnf.has_key("Queue-Report::Options::822"):
         f.close()
 
-    if Cnf.has_key("Queue-Report::Options::New"):
-        for dir in directories:
-            print """
-<p><img src="%s-day.png" alt="%s, last day"></p>
-<p><img src="%s-week.png" alt="%s, last week"></p>
-<p><img src="%s-month.png" alt="%s, last month"></p>
-<p><img src="%s-year.png" alt="%s, last year"></p>
-<p><img src="%s-5years.png" alt="%s, last 5 years"></p>
-<p><img src="%s-10years.png" alt="%s, last 10 years"></p>
-""" % ((dir,)*12)
-
     if Cnf.has_key("Queue-Report::Options::New"):
         footer()