Include the correct path to the graph images in new.html

[dak.git] / dak / queue_report.py

diff --git a/dak/queue_report.py b/dak/queue_report.py
index 19673d5593a0d313de1d97598d0236c6b4cffd9f..2f92bcf676eb42b2bf79085467a5ed0880d8da1e 100755 (executable)
--- a/dak/queue_report.py
+++ b/dak/queue_report.py
@@ -350,8 +350,11 @@ 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 as e:
+            print('warning: queue_report: rrdtool error, skipping %s.rrd: %s' % (type, e))
     except NameError:
         pass
 
@@ -653,12 +656,12 @@ def main():
     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>
+<p><img src="stat/%s-day.png" alt="%s, last day"></p>
+<p><img src="stat/%s-week.png" alt="%s, last week"></p>
+<p><img src="stat/%s-month.png" alt="%s, last month"></p>
+<p><img src="stat/%s-year.png" alt="%s, last year"></p>
+<p><img src="stat/%s-5years.png" alt="%s, last 5 years"></p>
+<p><img src="stat/%s-10years.png" alt="%s, last 10 years"></p>
 """ % ((dir,)*12)
 
     if Cnf.has_key("Queue-Report::Options::New"):