[freeside-commits] branch FREESIDE_3_BRANCH updated. f70682e6e2a8158101e8f77bb1b364d017aaa1a3

[Jonathan Prykop]

The branch, FREESIDE_3_BRANCH has been updated
       via  f70682e6e2a8158101e8f77bb1b364d017aaa1a3 (commit)
       via  54f53f28eb9dbd42705fabc76a17cfdb44b57b85 (commit)
      from  0cabf7d128df2d7286edc9697e311027eb94c596 (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 f70682e6e2a8158101e8f77bb1b364d017aaa1a3
Author: Jonathan Prykop <jonathan at freeside.biz>
Date:   Thu Jul 2 13:36:27 2015 -0500

    RT#18834: Cacti integration [warnings display to screen]

diff --git a/FS/FS/part_export/cacti.pm b/FS/FS/part_export/cacti.pm
index cfd71b2..c1117fc 100644
--- a/FS/FS/part_export/cacti.pm
+++ b/FS/FS/part_export/cacti.pm
@@ -494,11 +494,11 @@ sub process_graphs {
           die $error;
         }
       } else {
-        warn "File $thumbfile is too large, skipping";
+        $svchtml .= qq(<P STYLE="color: #FF0000">File $thumbfile is too large, skipping</P>);
       }
       unlink($thumbfile);
     } else {
-      warn "File $thumbfile does not exist, skipping";
+      $svchtml .= qq(<P STYLE="color: #FF0000">File $thumbfile does not exist, skipping</P>);
     }
     $job->update_statustext(49 + int($i / @graphs) * 50);
   }

commit 54f53f28eb9dbd42705fabc76a17cfdb44b57b85
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 cbb50af..cfd71b2 100644
--- a/FS/FS/part_export/cacti.pm
+++ b/FS/FS/part_export/cacti.pm
@@ -493,8 +493,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(+)