nextcloud / server

lib/private/Log/Syslog.php

Indentation +24 added lines, -24 removed lines

@@ -30,31 +30,31 @@
 use OCP\Log\IWriter;
 
 class Syslog extends LogDetails implements IWriter {
-	protected $levels = [
-		ILogger::DEBUG => LOG_DEBUG,
-		ILogger::INFO => LOG_INFO,
-		ILogger::WARN => LOG_WARNING,
-		ILogger::ERROR => LOG_ERR,
-		ILogger::FATAL => LOG_CRIT,
-	];
+    protected $levels = [
+        ILogger::DEBUG => LOG_DEBUG,
+        ILogger::INFO => LOG_INFO,
+        ILogger::WARN => LOG_WARNING,
+        ILogger::ERROR => LOG_ERR,
+        ILogger::FATAL => LOG_CRIT,
+    ];
 
-	public function __construct(SystemConfig $config) {
-		parent::__construct($config);
-		openlog($config->getSystemValue('syslog_tag', 'Nextcloud'), LOG_PID | LOG_CONS, LOG_USER);
-	}
+    public function __construct(SystemConfig $config) {
+        parent::__construct($config);
+        openlog($config->getSystemValue('syslog_tag', 'Nextcloud'), LOG_PID | LOG_CONS, LOG_USER);
+    }
 
-	public function __destruct() {
-		closelog();
-	}
+    public function __destruct() {
+        closelog();
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		$syslog_level = $this->levels[$level];
-		syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level));
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        $syslog_level = $this->levels[$level];
+        syslog($syslog_level, $this->logDetailsAsJSON($app, $message, $level));
+    }
 }

lib/private/Log/LogDetails.php

Indentation +68 added lines, -68 removed lines

@@ -27,75 +27,75 @@
 
 abstract class LogDetails {
 
-	/** @var SystemConfig */
-	private $config;
+    /** @var SystemConfig */
+    private $config;
 
-	public function __construct(SystemConfig $config) {
-		$this->config = $config;
-	}
+    public function __construct(SystemConfig $config) {
+        $this->config = $config;
+    }
 
-	public function logDetails(string $app, $message, int $level): array {
-		// default to ISO8601
-		$format = $this->config->getValue('logdateformat', \DateTime::ATOM);
-		$logTimeZone = $this->config->getValue('logtimezone', 'UTC');
-		try {
-			$timezone = new \DateTimeZone($logTimeZone);
-		} catch (\Exception $e) {
-			$timezone = new \DateTimeZone('UTC');
-		}
-		$time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
-		if ($time === false) {
-			$time = new \DateTime(null, $timezone);
-		} else {
-			// apply timezone if $time is created from UNIX timestamp
-			$time->setTimezone($timezone);
-		}
-		$request = \OC::$server->getRequest();
-		$reqId = $request->getId();
-		$remoteAddr = $request->getRemoteAddress();
-		// remove username/passwords from URLs before writing the to the log file
-		$time = $time->format($format);
-		$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
-		$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
-		if($this->config->getValue('installed', false)) {
-			$user = \OC_User::getUser() ? \OC_User::getUser() : '--';
-		} else {
-			$user = '--';
-		}
-		$userAgent = $request->getHeader('User-Agent');
-		if ($userAgent === '') {
-			$userAgent = '--';
-		}
-		$version = $this->config->getValue('version', '');
-		$entry = compact(
-			'reqId',
-			'level',
-			'time',
-			'remoteAddr',
-			'user',
-			'app',
-			'method',
-			'url',
-			'message',
-			'userAgent',
-			'version'
-		);
-		return $entry;
-	}
+    public function logDetails(string $app, $message, int $level): array {
+        // default to ISO8601
+        $format = $this->config->getValue('logdateformat', \DateTime::ATOM);
+        $logTimeZone = $this->config->getValue('logtimezone', 'UTC');
+        try {
+            $timezone = new \DateTimeZone($logTimeZone);
+        } catch (\Exception $e) {
+            $timezone = new \DateTimeZone('UTC');
+        }
+        $time = \DateTime::createFromFormat("U.u", number_format(microtime(true), 4, ".", ""));
+        if ($time === false) {
+            $time = new \DateTime(null, $timezone);
+        } else {
+            // apply timezone if $time is created from UNIX timestamp
+            $time->setTimezone($timezone);
+        }
+        $request = \OC::$server->getRequest();
+        $reqId = $request->getId();
+        $remoteAddr = $request->getRemoteAddress();
+        // remove username/passwords from URLs before writing the to the log file
+        $time = $time->format($format);
+        $url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
+        $method = is_string($request->getMethod()) ? $request->getMethod() : '--';
+        if($this->config->getValue('installed', false)) {
+            $user = \OC_User::getUser() ? \OC_User::getUser() : '--';
+        } else {
+            $user = '--';
+        }
+        $userAgent = $request->getHeader('User-Agent');
+        if ($userAgent === '') {
+            $userAgent = '--';
+        }
+        $version = $this->config->getValue('version', '');
+        $entry = compact(
+            'reqId',
+            'level',
+            'time',
+            'remoteAddr',
+            'user',
+            'app',
+            'method',
+            'url',
+            'message',
+            'userAgent',
+            'version'
+        );
+        return $entry;
+    }
 
-	public function logDetailsAsJSON(string $app, $message, int $level): string {
-		$entry = $this->logDetails($app, $message, $level);
-		// PHP's json_encode only accept proper UTF-8 strings, loop over all
-		// elements to ensure that they are properly UTF-8 compliant or convert
-		// them manually.
-		foreach($entry as $key => $value) {
-			if(is_string($value)) {
-				$testEncode = json_encode($value);
-				if($testEncode === false) {
-					$entry[$key] = utf8_encode($value);
-				}
-			}
-		}
-		return json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
-	}
+    public function logDetailsAsJSON(string $app, $message, int $level): string {
+        $entry = $this->logDetails($app, $message, $level);
+        // PHP's json_encode only accept proper UTF-8 strings, loop over all
+        // elements to ensure that they are properly UTF-8 compliant or convert
+        // them manually.
+        foreach($entry as $key => $value) {
+            if(is_string($value)) {
+                $testEncode = json_encode($value);
+                if($testEncode === false) {
+                    $entry[$key] = utf8_encode($value);
+                }
+            }
+        }
+        return json_encode($entry, JSON_PARTIAL_OUTPUT_ON_ERROR);
+    }
 }

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
 		$time = $time->format($format);
 		$url = ($request->getRequestUri() !== '') ? $request->getRequestUri() : '--';
 		$method = is_string($request->getMethod()) ? $request->getMethod() : '--';
-		if($this->config->getValue('installed', false)) {
+		if ($this->config->getValue('installed', false)) {
 			$user = \OC_User::getUser() ? \OC_User::getUser() : '--';
 		} else {
 			$user = '--';
@@ -88,10 +88,10 @@ 
 		// PHP's json_encode only accept proper UTF-8 strings, loop over all
 		// elements to ensure that they are properly UTF-8 compliant or convert
 		// them manually.
-		foreach($entry as $key => $value) {
-			if(is_string($value)) {
+		foreach ($entry as $key => $value) {
+			if (is_string($value)) {
 				$testEncode = json_encode($value);
-				if($testEncode === false) {
+				if ($testEncode === false) {
 					$entry[$key] = utf8_encode($value);
 				}
 			}

lib/private/Log/File.php

Indentation +102 added lines, -102 removed lines

@@ -48,110 +48,110 @@
  */
 
 class File extends LogDetails implements IWriter, IFileBased {
-	/** @var string */
-	protected $logFile;
-	/** @var int */
-	protected $logFileMode;
-	/** @var SystemConfig */
-	private $config;
+    /** @var string */
+    protected $logFile;
+    /** @var int */
+    protected $logFileMode;
+    /** @var SystemConfig */
+    private $config;
 
-	public function __construct(string $path, string $fallbackPath = '', SystemConfig $config) {
-		parent::__construct($config);
-		$this->logFile = $path;
-		if (!file_exists($this->logFile)) {
-			if(
-				(
-					!is_writable(dirname($this->logFile))
-					|| !touch($this->logFile)
-				)
-				&& $fallbackPath !== ''
-			) {
-				$this->logFile = $fallbackPath;
-			}
-		}
-		$this->config = $config;
-		$this->logFileMode = $config->getValue('logfilemode', 0640);
-	}
+    public function __construct(string $path, string $fallbackPath = '', SystemConfig $config) {
+        parent::__construct($config);
+        $this->logFile = $path;
+        if (!file_exists($this->logFile)) {
+            if(
+                (
+                    !is_writable(dirname($this->logFile))
+                    || !touch($this->logFile)
+                )
+                && $fallbackPath !== ''
+            ) {
+                $this->logFile = $fallbackPath;
+            }
+        }
+        $this->config = $config;
+        $this->logFileMode = $config->getValue('logfilemode', 0640);
+    }
 
-	/**
-	 * write a message in the log
-	 * @param string $app
-	 * @param string|array $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		$entry = $this->logDetailsAsJSON($app, $message, $level);
-		$handle = @fopen($this->logFile, 'a');
-		if ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) {
-			@chmod($this->logFile, $this->logFileMode);
-		}
-		if ($handle) {
-			fwrite($handle, $entry."\n");
-			fclose($handle);
-		} else {
-			// Fall back to error_log
-			error_log($entry);
-		}
-		if (php_sapi_name() === 'cli-server') {
-			if (!\is_string($message)) {
-				$message = json_encode($message);
-			}
-			error_log($message, 4);
-		}
-	}
+    /**
+     * write a message in the log
+     * @param string $app
+     * @param string|array $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        $entry = $this->logDetailsAsJSON($app, $message, $level);
+        $handle = @fopen($this->logFile, 'a');
+        if ($this->logFileMode > 0 && (fileperms($this->logFile) & 0777) != $this->logFileMode) {
+            @chmod($this->logFile, $this->logFileMode);
+        }
+        if ($handle) {
+            fwrite($handle, $entry."\n");
+            fclose($handle);
+        } else {
+            // Fall back to error_log
+            error_log($entry);
+        }
+        if (php_sapi_name() === 'cli-server') {
+            if (!\is_string($message)) {
+                $message = json_encode($message);
+            }
+            error_log($message, 4);
+        }
+    }
 
-	/**
-	 * get entries from the log in reverse chronological order
-	 * @param int $limit
-	 * @param int $offset
-	 * @return array
-	 */
-	public function getEntries(int $limit=50, int $offset=0):array {
-		$minLevel = $this->config->getValue("loglevel", ILogger::WARN);
-		$entries = array();
-		$handle = @fopen($this->logFile, 'rb');
-		if ($handle) {
-			fseek($handle, 0, SEEK_END);
-			$pos = ftell($handle);
-			$line = '';
-			$entriesCount = 0;
-			$lines = 0;
-			// Loop through each character of the file looking for new lines
-			while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) {
-				fseek($handle, $pos);
-				$ch = fgetc($handle);
-				if ($ch == "\n" || $pos == 0) {
-					if ($line != '') {
-						// Add the first character if at the start of the file,
-						// because it doesn't hit the else in the loop
-						if ($pos == 0) {
-							$line = $ch.$line;
-						}
-						$entry = json_decode($line);
-						// Add the line as an entry if it is passed the offset and is equal or above the log level
-						if ($entry->level >= $minLevel) {
-							$lines++;
-							if ($lines > $offset) {
-								$entries[] = $entry;
-								$entriesCount++;
-							}
-						}
-						$line = '';
-					}
-				} else {
-					$line = $ch.$line;
-				}
-				$pos--;
-			}
-			fclose($handle);
-		}
-		return $entries;
-	}
+    /**
+     * get entries from the log in reverse chronological order
+     * @param int $limit
+     * @param int $offset
+     * @return array
+     */
+    public function getEntries(int $limit=50, int $offset=0):array {
+        $minLevel = $this->config->getValue("loglevel", ILogger::WARN);
+        $entries = array();
+        $handle = @fopen($this->logFile, 'rb');
+        if ($handle) {
+            fseek($handle, 0, SEEK_END);
+            $pos = ftell($handle);
+            $line = '';
+            $entriesCount = 0;
+            $lines = 0;
+            // Loop through each character of the file looking for new lines
+            while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) {
+                fseek($handle, $pos);
+                $ch = fgetc($handle);
+                if ($ch == "\n" || $pos == 0) {
+                    if ($line != '') {
+                        // Add the first character if at the start of the file,
+                        // because it doesn't hit the else in the loop
+                        if ($pos == 0) {
+                            $line = $ch.$line;
+                        }
+                        $entry = json_decode($line);
+                        // Add the line as an entry if it is passed the offset and is equal or above the log level
+                        if ($entry->level >= $minLevel) {
+                            $lines++;
+                            if ($lines > $offset) {
+                                $entries[] = $entry;
+                                $entriesCount++;
+                            }
+                        }
+                        $line = '';
+                    }
+                } else {
+                    $line = $ch.$line;
+                }
+                $pos--;
+            }
+            fclose($handle);
+        }
+        return $entries;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLogFilePath():string {
-		return $this->logFile;
-	}
+    /**
+     * @return string
+     */
+    public function getLogFilePath():string {
+        return $this->logFile;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -59,7 +59,7 @@ 
 		parent::__construct($config);
 		$this->logFile = $path;
 		if (!file_exists($this->logFile)) {
-			if(
+			if (
 				(
 					!is_writable(dirname($this->logFile))
 					|| !touch($this->logFile)
@@ -106,7 +106,7 @@ 
 	 * @param int $offset
 	 * @return array
 	 */
-	public function getEntries(int $limit=50, int $offset=0):array {
+	public function getEntries(int $limit = 50, int $offset = 0):array {
 		$minLevel = $this->config->getValue("loglevel", ILogger::WARN);
 		$entries = array();
 		$handle = @fopen($this->logFile, 'rb');
@@ -117,7 +117,7 @@ 
 			$entriesCount = 0;
 			$lines = 0;
 			// Loop through each character of the file looking for new lines
-			while ($pos >= 0 && ($limit === null ||$entriesCount < $limit)) {
+			while ($pos >= 0 && ($limit === null || $entriesCount < $limit)) {
 				fseek($handle, $pos);
 				$ch = fgetc($handle);
 				if ($ch == "\n" || $pos == 0) {

lib/private/Log/Systemdlog.php

Indentation +29 added lines, -29 removed lines

@@ -44,37 +44,37 @@
 //     Syslog compatibility fields
 
 class Systemdlog extends LogDetails implements IWriter {
-	protected $levels = [
-		ILogger::DEBUG => 7,
-		ILogger::INFO => 6,
-		ILogger::WARN => 4,
-		ILogger::ERROR => 3,
-		ILogger::FATAL => 2,
-	];
+    protected $levels = [
+        ILogger::DEBUG => 7,
+        ILogger::INFO => 6,
+        ILogger::WARN => 4,
+        ILogger::ERROR => 3,
+        ILogger::FATAL => 2,
+    ];
 
-	protected $syslogId;
+    protected $syslogId;
 
-	public function __construct(SystemConfig $config) {
-		parent::__construct($config);
-		if(!function_exists('sd_journal_send')) {
-			throw new HintException(
-				'PHP extension php-systemd is not available.',
-				'Please install and enable PHP extension systemd if you wish to log to the Systemd journal.');
+    public function __construct(SystemConfig $config) {
+        parent::__construct($config);
+        if(!function_exists('sd_journal_send')) {
+            throw new HintException(
+                'PHP extension php-systemd is not available.',
+                'Please install and enable PHP extension systemd if you wish to log to the Systemd journal.');
 
-		}
-		$this->syslogId = $config->getValue('syslog_tag', 'Nextcloud');
-	}
+        }
+        $this->syslogId = $config->getValue('syslog_tag', 'Nextcloud');
+    }
 
-	/**
-	 * Write a message to the log.
-	 * @param string $app
-	 * @param string $message
-	 * @param int $level
-	 */
-	public function write(string $app, $message, int $level) {
-		$journal_level = $this->levels[$level];
-		sd_journal_send('PRIORITY='.$journal_level,
-				'SYSLOG_IDENTIFIER='.$this->syslogId,
-				'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level));
-	}
+    /**
+     * Write a message to the log.
+     * @param string $app
+     * @param string $message
+     * @param int $level
+     */
+    public function write(string $app, $message, int $level) {
+        $journal_level = $this->levels[$level];
+        sd_journal_send('PRIORITY='.$journal_level,
+                'SYSLOG_IDENTIFIER='.$this->syslogId,
+                'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level));
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 
 	public function __construct(SystemConfig $config) {
 		parent::__construct($config);
-		if(!function_exists('sd_journal_send')) {
+		if (!function_exists('sd_journal_send')) {
 			throw new HintException(
 				'PHP extension php-systemd is not available.',
 				'Please install and enable PHP extension systemd if you wish to log to the Systemd journal.');
@@ -75,6 +75,6 @@ 
 		$journal_level = $this->levels[$level];
 		sd_journal_send('PRIORITY='.$journal_level,
 				'SYSLOG_IDENTIFIER='.$this->syslogId,
-				'MESSAGE=' . $this->logDetailsAsJSON($app, $message, $level));
+				'MESSAGE='.$this->logDetailsAsJSON($app, $message, $level));
 	}
 }