[freeside-commits] branch FREESIDE_4_BRANCH updated. 715320db25c6382661abfddf20e785e2d535a226

[Jonathan Prykop]

The branch, FREESIDE_4_BRANCH has been updated
       via  715320db25c6382661abfddf20e785e2d535a226 (commit)
       via  0cabbbf46eaa1a1ceab79e2cb33acbd22d6a479b (commit)
      from  6137f949eb8943d52e58c91942fb65dc04f94ae1 (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 715320db25c6382661abfddf20e785e2d535a226
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 b41fe9b..c83e453 100644
--- a/FS/FS/part_export/cacti.pm
+++ b/FS/FS/part_export/cacti.pm
@@ -491,11 +491,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 0cabbbf46eaa1a1ceab79e2cb33acbd22d6a479b
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(+)