diff options
| author | Rob Austein <sra@hactrn.net> | 2013-07-16 02:28:13 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-07-16 02:28:13 +0000 |
| commit | 489a922179308f6843b0c7cbf55299cb9f588960 (patch) | |
| tree | b6b5ddb440dd0380e94c5f2b2ac8e30d77991881 /rcynic/rcynic-cron.py | |
| parent | 4555274c8b7966a6b53dcf06031dc7329c688500 (diff) | |
Save rcynic-html for last in rcynic-cron, as it's less critical than
tasks like feeding the rpki-rtr engine. Treat failure to find rrdtool
as a fatal error during ./configure, to avoid building a version of
rcynic-html that can't generate graphs. Closes #583.
svn path=/trunk/; revision=5430
Diffstat (limited to 'rcynic/rcynic-cron.py')
| -rw-r--r-- | rcynic/rcynic-cron.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/rcynic/rcynic-cron.py b/rcynic/rcynic-cron.py index c6c32405..cadc24d6 100644 --- a/rcynic/rcynic-cron.py +++ b/rcynic/rcynic-cron.py @@ -96,11 +96,6 @@ if want_chroot: else: run(os.path.join(ac_bindir, "rcynic"), "-c", os.path.join(ac_sysconfdir, "rcynic.conf")) -if ac_rcynic_html_dir and os.path.exists(os.path.dirname(ac_rcynic_html_dir)): - run(os.path.join(ac_bindir, "rcynic-html"), - os.path.join(ac_rcynic_dir, "data/rcynic.xml"), - ac_rcynic_html_dir) - run(os.path.join(ac_bindir, "rtr-origin"), "--cronjob", os.path.join(ac_rcynic_dir, "data/authenticated"), @@ -109,3 +104,8 @@ run(os.path.join(ac_bindir, "rtr-origin"), prog = os.path.join(ac_libexecdir, "rpkigui-rcynic") if os.path.exists(prog): run(prog) + +if ac_rcynic_html_dir and os.path.exists(os.path.dirname(ac_rcynic_html_dir)): + run(os.path.join(ac_bindir, "rcynic-html"), + os.path.join(ac_rcynic_dir, "data/rcynic.xml"), + ac_rcynic_html_dir) |