X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFactory%2FLoggerFactory.php;h=55091a4879456c81d366b669b83f93b28d8ee6c6;hb=c07cb2c8f31154cc424e99c95740d753501e09b7;hp=cf7888cabb5b9f82e8b4453da297b463efaffc21;hpb=fab01ed0d3944a50c34955300bd6b4a9baf5d2d2;p=friendica.git

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index cf7888cabb..55091a4879 100644
--- a/src/Factory/LoggerFactory.php
+++ b/src/Factory/LoggerFactory.php
@@ -4,6 +4,7 @@ namespace Friendica\Factory;
 
 use Friendica\Core\Config\Configuration;
 use Friendica\Core\Logger;
+use Friendica\Database\Database;
 use Friendica\Network\HTTPException\InternalServerErrorException;
 use Friendica\Util\Introspection;
 use Friendica\Util\Logger\Monolog\DevelopHandler;
@@ -12,7 +13,6 @@ use Friendica\Util\Logger\ProfilerLogger;
 use Friendica\Util\Logger\StreamLogger;
 use Friendica\Util\Logger\SyslogLogger;
 use Friendica\Util\Logger\VoidLogger;
-use Friendica\Util\Logger\WorkerLogger;
 use Friendica\Util\Profiler;
 use Monolog;
 use Psr\Log\LoggerInterface;
@@ -25,21 +25,31 @@ use Psr\Log\LogLevel;
  */
 class LoggerFactory
 {
+	const DEV_CHANNEL = 'dev';
+
 	/**
 	 * A list of classes, which shouldn't get logged
+	 *
 	 * @var array
 	 */
 	private static $ignoreClassList = [
 		Logger::class,
 		Profiler::class,
-		WorkerLogger::class
+		'Friendica\\Util\\Logger',
 	];
 
+	private $channel;
+
+	public function __construct(string $channel)
+	{
+		$this->channel = $channel;
+	}
+
 	/**
 	 * Creates a new PSR-3 compliant logger instances
 	 *
-	 * @param string        $channel The channel of the logger instance
-	 * @param Configuration $config  The config
+	 * @param Database      $database The Friendica Database instance
+	 * @param Configuration $config   The config
 	 * @param Profiler      $profiler The profiler of the app
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
@@ -47,24 +57,24 @@ class LoggerFactory
 	 * @throws \Exception
 	 * @throws InternalServerErrorException
 	 */
-	public static function create($channel, Configuration $config, Profiler $profiler)
+	public function create( Database $database, Configuration $config, Profiler $profiler)
 	{
 		if (empty($config->get('system', 'debugging', false))) {
 			$logger = new VoidLogger();
-			Logger::init($logger);
+			$database->setLogger($logger);
 			return $logger;
 		}
 
 		$introspection = new Introspection(self::$ignoreClassList);
-		$level = $config->get('system', 'loglevel');
-		$loglevel = self::mapLegacyConfigDebugLevel((string)$level);
+		$level         = $config->get('system', 'loglevel');
+		$loglevel      = self::mapLegacyConfigDebugLevel((string)$level);
 
 		switch ($config->get('system', 'logger_config', 'stream')) {
 			case 'monolog':
 				$loggerTimeZone = new \DateTimeZone('UTC');
 				Monolog\Logger::setTimezone($loggerTimeZone);
 
-				$logger = new Monolog\Logger($channel);
+				$logger = new Monolog\Logger($this->channel);
 				$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 				$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 				$logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -72,17 +82,25 @@ class LoggerFactory
 
 				$stream = $config->get('system', 'logfile');
 
-				static::addStreamHandler($logger, $stream, $loglevel);
+				// just add a stream in case it's either writable or not file
+				if (!is_file($stream) || is_writable($stream)) {
+					static::addStreamHandler($logger, $stream, $loglevel);
+				}
 				break;
 
 			case 'syslog':
-				$logger = new SyslogLogger($channel, $introspection, $loglevel);
+				$logger = new SyslogLogger($this->channel, $introspection, $loglevel);
 				break;
 
 			case 'stream':
 			default:
 				$stream = $config->get('system', 'logfile');
-				$logger = new StreamLogger($channel, $stream, $introspection, $loglevel);
+				// just add a stream in case it's either writable or not file
+				if (!is_file($stream) || is_writable($stream)) {
+					$logger = new StreamLogger($this->channel, $stream, $introspection, $loglevel);
+				} else {
+					$logger = new VoidLogger();
+				}
 				break;
 		}
 
@@ -93,8 +111,7 @@ class LoggerFactory
 			$logger = new ProfilerLogger($logger, $profiler);
 		}
 
-		Logger::init($logger);
-
+		$database->setLogger($logger);
 		return $logger;
 	}
 
@@ -106,8 +123,7 @@ class LoggerFactory
 	 *
 	 * It should never get filled during normal usage of Friendica
 	 *
-	 * @param string        $channel The channel of the logger instance
-	 * @param Configuration $config  The config
+	 * @param Configuration $config   The config
 	 * @param Profiler      $profiler The profiler of the app
 	 *
 	 * @return LoggerInterface The PSR-3 compliant logger instance
@@ -115,15 +131,15 @@ class LoggerFactory
 	 * @throws InternalServerErrorException
 	 * @throws \Exception
 	 */
-	public static function createDev($channel, Configuration $config, Profiler $profiler)
+	public static function createDev(Configuration $config, Profiler $profiler)
 	{
 		$debugging   = $config->get('system', 'debugging');
 		$stream      = $config->get('system', 'dlogfile');
 		$developerIp = $config->get('system', 'dlogip');
 
-		if (!isset($developerIp) || !$debugging) {
+		if ((!isset($developerIp) || !$debugging) &&
+		    (!is_file($stream) || is_writable($stream))) {
 			$logger = new VoidLogger();
-			Logger::setDevLogger($logger);
 			return $logger;
 		}
 
@@ -138,7 +154,7 @@ class LoggerFactory
 				$loggerTimeZone = new \DateTimeZone('UTC');
 				Monolog\Logger::setTimezone($loggerTimeZone);
 
-				$logger = new Monolog\Logger($channel);
+				$logger = new Monolog\Logger(self::DEV_CHANNEL);
 				$logger->pushProcessor(new Monolog\Processor\PsrLogMessageProcessor());
 				$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
 				$logger->pushProcessor(new Monolog\Processor\UidProcessor());
@@ -150,12 +166,12 @@ class LoggerFactory
 				break;
 
 			case 'syslog':
-				$logger = new SyslogLogger($channel, $introspection,  LogLevel::DEBUG);
+				$logger = new SyslogLogger(self::DEV_CHANNEL, $introspection, LogLevel::DEBUG);
 				break;
 
 			case 'stream':
 			default:
-				$logger = new StreamLogger($channel, $stream, $introspection, LogLevel::DEBUG);
+				$logger = new StreamLogger(self::DEV_CHANNEL, $stream, $introspection, LogLevel::DEBUG);
 				break;
 		}
 
@@ -166,13 +182,12 @@ class LoggerFactory
 			$logger = new ProfilerLogger($logger, $profiler);
 		}
 
-		Logger::setDevLogger($logger);
-
 		return $logger;
 	}
 
 	/**
 	 * Mapping a legacy level to the PSR-3 compliant levels
+	 *
 	 * @see https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md#5-psrlogloglevel
 	 *
 	 * @param string $level the level to be mapped
@@ -209,9 +224,9 @@ class LoggerFactory
 	/**
 	 * Adding a handler to a given logger instance
 	 *
-	 * @param LoggerInterface $logger  The logger instance
-	 * @param mixed           $stream  The stream which handles the logger output
-	 * @param string          $level   The level, for which this handler at least should handle logging
+	 * @param LoggerInterface $logger The logger instance
+	 * @param mixed           $stream The stream which handles the logger output
+	 * @param string          $level  The level, for which this handler at least should handle logging
 	 *
 	 * @return void
 	 *