Commit 070537c6 authored by Sebastian Kummer's avatar Sebastian Kummer

ZP-1104 Make BuildLogString calls uppercase, fix missing parameter.

Released under the Affero GNU General Public License (AGPL) version 3.
parent 4c151aac
......@@ -107,7 +107,7 @@ class FileLog extends Log {
* @return void
*/
protected function Write($loglevel, $message) {
$data = $this->buildLogString($loglevel, $message, true) . PHP_EOL;
$data = $this->BuildLogString($loglevel, $message, true) . PHP_EOL;
@file_put_contents(LOGFILE, $data, FILE_APPEND);
}
......@@ -120,7 +120,7 @@ class FileLog extends Log {
* @return void
*/
public function WriteForUser($loglevel, $message) {
$data = $this->buildLogString($loglevel, $message, false) . PHP_EOL;
$data = $this->BuildLogString($loglevel, $message, false) . PHP_EOL;
@file_put_contents(LOGFILEDIR . $this->getLogToUserFile(), $data, FILE_APPEND);
}
......@@ -133,7 +133,7 @@ class FileLog extends Log {
*/
protected function afterLog($loglevel, $message) {
if ($loglevel & (LOGLEVEL_FATAL | LOGLEVEL_ERROR | LOGLEVEL_WARN)) {
$data = $this->buildLogString($loglevel, $message) . PHP_EOL;
$data = $this->BuildLogString($loglevel, $message, true) . PHP_EOL;
@file_put_contents(LOGERRORFILE, $data, FILE_APPEND);
}
}
......
......@@ -191,7 +191,7 @@ class Syslog extends Log {
$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
$facility = 1; // user level
$pri = ($facility * 8) + $loglevel; // multiplying the Facility number by 8 + adding the level
$data = $this->buildLogString($loglevel, $message);
$data = $this->BuildLogString($loglevel, $message);
if (strlen(trim($data)) > 0) {
$syslog_message = "<{$pri}>" . date('M d H:i:s ') . '[' . $this->GetProgramName() . ']: ' . $data;
socket_sendto($sock, $syslog_message, strlen($syslog_message), 0, $this->GetHost(), $this->GetPort());
......@@ -201,7 +201,7 @@ class Syslog extends Log {
openlog($this->GenerateProgramName(), LOG_PID, LOG_SYSLOG_FACILITY);
syslog(
$this->GetZpushLogLevelToSyslogLogLevel($loglevel),
$this->buildLogString($loglevel, $message)
$this->BuildLogString($loglevel, $message)
);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment