diff options
| author | Martin Fuchs <trendchiller@users.noreply.github.com> | 2014-06-10 15:48:33 +0200 |
|---|---|---|
| committer | Martin Fuchs <trendchiller@users.noreply.github.com> | 2014-06-10 15:48:33 +0200 |
| commit | 0ef20f92b5bea3d3487c249d515f905d09f859a7 (patch) | |
| tree | 76101c20efe2f68b0f455070f1f077058e52868d /config/mailreport | |
| parent | ff5060af8732ef9bd55a95537f3705c7382e19e0 (diff) | |
| parent | b2bea6eac166ab17ed1e5776ea32d822f459a914 (diff) | |
| download | pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.tar.gz pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.tar.bz2 pfsense-packages-0ef20f92b5bea3d3487c249d515f905d09f859a7.zip | |
Merge pull request #1 from pfsense/master
update fork
Diffstat (limited to 'config/mailreport')
| -rw-r--r-- | config/mailreport/mail_reports.inc | 8 | ||||
| -rw-r--r-- | config/mailreport/mailreport.xml | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/config/mailreport/mail_reports.inc b/config/mailreport/mail_reports.inc index 5d9e74b2..0119457a 100644 --- a/config/mailreport/mail_reports.inc +++ b/config/mailreport/mail_reports.inc @@ -1243,7 +1243,13 @@ function mail_report_get_log($logfile, $tail, $grepfor) { if(isset($config['system']['usefifolog'])) { exec("/usr/sbin/fifolog_reader {$logfile}{$grepline} | /usr/bin/tail -n {$tail}", $logarr); } else { - exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + if (is_executable("/usr/local/sbin/clog")) { + exec("/usr/local/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + } elseif (is_executable("/usr/sbin/clog")) { + exec("/usr/sbin/clog {$logfile}{$grepline}| grep -v \"CLOG\" | grep -v \"\033\" | /usr/bin/tail -n {$tail}", $logarr); + } else { + $logarr = array("Cannot locate clog which is required for reading log files."); + } } } return($logarr); diff --git a/config/mailreport/mailreport.xml b/config/mailreport/mailreport.xml index fe6899d4..9239f82e 100644 --- a/config/mailreport/mailreport.xml +++ b/config/mailreport/mailreport.xml @@ -37,7 +37,7 @@ ]]> </copyright> <name>mailreport</name> - <version>2.0.11</version> + <version>2.0.12</version> <title>Status: Email Reports</title> <additional_files_needed> <prefix>/usr/local/bin/</prefix> |