[freeside-commits] branch master updated. 379c06ccd4b984bfa8130d98f862799239a8d00c

[Jonathan Prykop]

The branch, master has been updated
       via  379c06ccd4b984bfa8130d98f862799239a8d00c (commit)
       via  0b9c15a3add1d3715c3895171894ac6480d1dfc1 (commit)
      from  838897525d851ea5cb1386c253471a02a3f41b5f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 379c06ccd4b984bfa8130d98f862799239a8d00c
Merge: 0b9c15a 8388975
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Jul 2 13:17:00 2015 -0500

    Merge branch 'master' of git.freeside.biz:/home/git/freeside


commit 0b9c15a3add1d3715c3895171894ac6480d1dfc1
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Jul 2 13:16:21 2015 -0500

    RT#18834: Cacti integration [added warning messages]

diff --git a/FS/FS/part_export/cacti.pm b/FS/FS/part_export/cacti.pm
index eff6c52..b41fe9b 100644
--- a/FS/FS/part_export/cacti.pm
+++ b/FS/FS/part_export/cacti.pm
@@ -490,8 +490,12 @@ sub process_graphs {
           $dbh->rollback if $oldAutoCommit;
           die $error;
         }
+      } else {
+        warn "File $thumbfile is too large, skipping";
       }
       unlink($thumbfile);
+    } else {
+      warn "File $thumbfile does not exist, skipping";
     }
     $job->update_statustext(49 + int($i / @graphs) * 50);
   }

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_export/cacti.pm |    4 ++++
 1 file changed, 4 insertions(+)