From e6d92cc94a56660207e08095865195da97d403a5 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:11:14 +0000
Subject: [PATCH 1/6] Rewrite Monolog factory to implement LoggerFactory

---
 .../{Monolog.php => MonologFactory.php}       | 41 ++++++++++++++-----
 monolog/static/dependencies.config.php        |  7 +---
 monolog/static/strategies.config.php          | 26 ------------
 3 files changed, 33 insertions(+), 41 deletions(-)
 rename monolog/src/Factory/{Monolog.php => MonologFactory.php} (51%)
 delete mode 100644 monolog/static/strategies.config.php

diff --git a/monolog/src/Factory/Monolog.php b/monolog/src/Factory/MonologFactory.php
similarity index 51%
rename from monolog/src/Factory/Monolog.php
rename to monolog/src/Factory/MonologFactory.php
index c5c69824..ede4d5b2 100644
--- a/monolog/src/Factory/Monolog.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -4,7 +4,8 @@ namespace Friendica\Addon\monolog\src\Factory;
 
 use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
 use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Factory\AbstractLoggerTypeFactory;
+use Friendica\Core\Logger\Capability\IHaveCallIntrospections;
+use Friendica\Core\Logger\Factory\LoggerFactory;
 use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
@@ -16,32 +17,52 @@ use Psr\Log\LogLevel;
 
 require_once __DIR__ . '/../../vendor/autoload.php';
 
-class Monolog extends AbstractLoggerTypeFactory
+final class MonologFactory implements LoggerFactory
 {
-	public function create(IManageConfigValues $config, string $loglevel = null): LoggerInterface
+	private IHaveCallIntrospections $introspection;
+
+	private IManageConfigValues $config;
+
+	/**
+	 * @param string $channel The channel for the logger
+	 */
+	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
+	{
+		$this->introspection = $introspection;
+		$this->config        = $config;
+	}
+
+	/**
+	 * Creates and returns a PSR-3 Logger instance.
+	 *
+	 * Calling this method multiple times with the same parameters SHOULD return the same object.
+	 *
+	 * @param \Psr\Log\LogLevel::* $logLevel The log level
+	 * @param \Friendica\Core\Logger\Capability\LogChannel::* $logChannel The log channel
+	 */
+	public function createLogger(string $logLevel, string $logChannel): LoggerInterface
 	{
 		$loggerTimeZone = new \DateTimeZone('UTC');
 
-		$logger = new Logger($this->channel);
+		$logger = new Logger($logChannel);
 		$logger->setTimezone($loggerTimeZone);
 		$logger->pushProcessor(new PsrLogMessageProcessor());
 		$logger->pushProcessor(new ProcessIdProcessor());
 		$logger->pushProcessor(new UidProcessor());
 		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
 
-		$logfile = $config->get('system', 'logfile');
+		$logfile = $this->config->get('system', 'logfile');
 
 		// just add a stream in case it's either writable or not file
 		if (is_writable($logfile)) {
-			$loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel'));
-			$loglevel = Logger::toMonologLevel($loglevel);
+			$logLevel = Logger::toMonologLevel($logLevel);
 
 			// fallback to notice if an invalid loglevel is set
-			if (!is_int($loglevel)) {
-				$loglevel = LogLevel::NOTICE;
+			if (!is_int($logLevel)) {
+				$logLevel = LogLevel::NOTICE;
 			}
 
-			$fileHandler = new StreamHandler($logfile, $loglevel);
+			$fileHandler = new StreamHandler($logfile, $logLevel);
 
 			$formatter = new LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
 			$fileHandler->setFormatter($formatter);
diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
index e3066594..75ea8df7 100644
--- a/monolog/static/dependencies.config.php
+++ b/monolog/static/dependencies.config.php
@@ -20,10 +20,7 @@
  */
 
 return [
-	\Monolog\Logger::class => [
-		'instanceOf' => \Friendica\Addon\monolog\src\Factory\Monolog::class,
-		'call' => [
-			['create', [], \Dice\Dice::CHAIN_CALL],
-		],
+	\Friendica\Core\Logger\Factory\LoggerFactory::class => [
+		'instanceOf' => \Friendica\Addon\monolog\src\Factory\MonologFactory::class,
 	],
 ];
diff --git a/monolog/static/strategies.config.php b/monolog/static/strategies.config.php
deleted file mode 100644
index 87153839..00000000
--- a/monolog/static/strategies.config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-return [
-	\Psr\Log\LoggerInterface::class => [
-		\Monolog\Logger::class => ['monolog'],
-	],
-];

From 0bafcc78f827b4bc1f064a0cc73a3c87700ced63 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:06 +0000
Subject: [PATCH 2/6] Add READMD.md for monolog addon

---
 monolog/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 monolog/README.md

diff --git a/monolog/README.md b/monolog/README.md
new file mode 100644
index 00000000..e5a139e9
--- /dev/null
+++ b/monolog/README.md
@@ -0,0 +1,14 @@
+# Monolog Addon
+
+A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
+
+Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+
+```
+// in config/local.config.php
+// ...
+    'system' => [
+        'logger_config' => 'monolog',
+    ]
+// ...
+```

From f7ec934893bda2ac130dd5e6867ed564a074a943 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:20:22 +0000
Subject: [PATCH 3/6] bump version to 1.1

---
 monolog/monolog.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/monolog/monolog.php b/monolog/monolog.php
index b13efff9..f194aac4 100644
--- a/monolog/monolog.php
+++ b/monolog/monolog.php
@@ -1,7 +1,7 @@
 <?php
 /*
  * Name: Monolog
- * Description: A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory
- * Version: 1.0
+ * Description: A Logging framework with lots of additions, customized for Friendica.
+ * Version: 1.1
  * Author: Philipp Holzer
  */

From c4f8c65817c478e0e682a8a74573deb634642c8b Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Wed, 5 Feb 2025 15:32:24 +0000
Subject: [PATCH 4/6] Remove wrong phpdoc

---
 monolog/src/Factory/MonologFactory.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/monolog/src/Factory/MonologFactory.php b/monolog/src/Factory/MonologFactory.php
index ede4d5b2..e0c11e13 100644
--- a/monolog/src/Factory/MonologFactory.php
+++ b/monolog/src/Factory/MonologFactory.php
@@ -23,9 +23,6 @@ final class MonologFactory implements LoggerFactory
 
 	private IManageConfigValues $config;
 
-	/**
-	 * @param string $channel The channel for the logger
-	 */
 	public function __construct(IHaveCallIntrospections $introspection, IManageConfigValues $config)
 	{
 		$this->introspection = $introspection;

From ed75360eb4f573c961dc1e1eca58bed7b2ba37e1 Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 09:27:22 +0000
Subject: [PATCH 5/6] Setting the logger_config config is no longer needed

---
 monolog/README.md | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index e5a139e9..74ade29d 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -3,12 +3,3 @@
 A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
 
 Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
-
-```
-// in config/local.config.php
-// ...
-    'system' => [
-        'logger_config' => 'monolog',
-    ]
-// ...
-```

From 5701853d295f08c93cdc5f2b0e807bab85d4cddd Mon Sep 17 00:00:00 2001
From: Art4 <art4@wlabs.de>
Date: Thu, 6 Feb 2025 11:35:10 +0000
Subject: [PATCH 6/6] Remove config docs, format syntax

---
 monolog/README.md | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/monolog/README.md b/monolog/README.md
index 74ade29d..efb7959a 100644
--- a/monolog/README.md
+++ b/monolog/README.md
@@ -1,5 +1,4 @@
 # Monolog Addon
 
-A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory.
-
-Set `system.logger_config` to `monolog` in your `config/local.config.php` file to activate Monolog.
+A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)).
+There are just Friendica additions inside the src directory.