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

diff --git a/src/Factory/LoggerFactory.php b/src/Factory/LoggerFactory.php
index bdd85cf3ae..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;
@@ -24,6 +25,8 @@ use Psr\Log\LogLevel;
  */
 class LoggerFactory
 {
+	const DEV_CHANNEL = 'dev';
+
 	/**
 	 * A list of classes, which shouldn't get logged
 	 *
@@ -35,10 +38,17 @@ class LoggerFactory
 		'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 Database      $database The Friendica Database instance
 	 * @param Configuration $config   The config
 	 * @param Profiler      $profiler The profiler of the app
 	 *
@@ -47,11 +57,11 @@ 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;
 		}
 
@@ -64,7 +74,7 @@ class LoggerFactory
 				$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());
@@ -79,7 +89,7 @@ class LoggerFactory
 				break;
 
 			case 'syslog':
-				$logger = new SyslogLogger($channel, $introspection, $loglevel);
+				$logger = new SyslogLogger($this->channel, $introspection, $loglevel);
 				break;
 
 			case 'stream':
@@ -87,7 +97,7 @@ class LoggerFactory
 				$stream = $config->get('system', 'logfile');
 				// just add a stream in case it's either writable or not file
 				if (!is_file($stream) || is_writable($stream)) {
-					$logger = new StreamLogger($channel, $stream, $introspection, $loglevel);
+					$logger = new StreamLogger($this->channel, $stream, $introspection, $loglevel);
 				} else {
 					$logger = new VoidLogger();
 				}
@@ -101,8 +111,7 @@ class LoggerFactory
 			$logger = new ProfilerLogger($logger, $profiler);
 		}
 
-		Logger::init($logger);
-
+		$database->setLogger($logger);
 		return $logger;
 	}
 
@@ -114,7 +123,6 @@ 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 Profiler      $profiler The profiler of the app
 	 *
@@ -123,7 +131,7 @@ 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');
@@ -132,7 +140,6 @@ class LoggerFactory
 		if ((!isset($developerIp) || !$debugging) &&
 		    (!is_file($stream) || is_writable($stream))) {
 			$logger = new VoidLogger();
-			Logger::setDevLogger($logger);
 			return $logger;
 		}
 
@@ -147,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());
@@ -159,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;
 		}
 
@@ -175,8 +182,6 @@ class LoggerFactory
 			$logger = new ProfilerLogger($logger, $profiler);
 		}
 
-		Logger::setDevLogger($logger);
-
 		return $logger;
 	}