[freeside-commits] branch master updated. 632dd8ec5c4f4eaccb71607407b934ddf8935104

Jonathan Prykop jonathan at 420.am
Thu Jul 2 11:37:09 PDT 2015


The branch, master has been updated
       via  632dd8ec5c4f4eaccb71607407b934ddf8935104 (commit)
      from  379c06ccd4b984bfa8130d98f862799239a8d00c (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 632dd8ec5c4f4eaccb71607407b934ddf8935104
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);
   }

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

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




More information about the freeside-commits mailing list