improve log system

Author: mobula9

docs/contribute.md

@@ -135,7 +135,7 @@ docker-compose run wordpress<X.X> bash
 ### Display the plugin logs
 
 ```bash
-tail -f logs/*
+tail -f logs/debug-*
 ```
 
 #### New feature workflow

inc/bouncer-instance.php

@@ -3,6 +3,7 @@
 use CrowdSecBouncer\Bouncer;
 use CrowdSecBouncer\BouncerException;
 use CrowdSecBouncer\Constants;
+use Monolog\Formatter\LineFormatter;
 use Monolog\Handler\RotatingFileHandler;
 use Monolog\Logger;
 use Symfony\Component\Cache\Adapter\AbstractAdapter;
@@ -25,15 +26,18 @@ function getCrowdSecLoggerInstance(): Logger
 
     // Log more data if WP_DEBUG=1
 
-    $loggerLevel = WP_DEBUG ? Logger::DEBUG : Logger::INFO;
     $logger = new Logger('wp_bouncer');
-    $fileHandler = new RotatingFileHandler(CROWDSEC_LOG_PATH, 0, $loggerLevel);
 
-    // Set custom readble logger for WP_DEBUG=1
+    $fileHandler = new RotatingFileHandler(CROWDSEC_LOG_PATH, 0, Logger::INFO);
+    $fileHandler->setFormatter(new LineFormatter("%datetime%|%level%|%context%\n"));
+    $logger->pushHandler($fileHandler);
+
+    // Set custom readable logger for WP_DEBUG=1
     if (WP_DEBUG) {
-        $fileHandler->setFormatter(new \Bramus\Monolog\Formatter\ColoredLineFormatter(null, "[%datetime%] %message% %context%\n", 'H:i:s'));
+        $debugFileHandler = new RotatingFileHandler(CROWDSEC_DEBUG_LOG_PATH, 0, Logger::DEBUG);
+        $debugFileHandler->setFormatter(new \Bramus\Monolog\Formatter\ColoredLineFormatter(null, "[%datetime%] %message% %context%\n", 'H:i:s'));
+        $logger->pushHandler($debugFileHandler);
     }
-    $logger->pushHandler($fileHandler);
 
     return $logger;
 }

inc/constants.php

@@ -1,6 +1,8 @@
 <?php
 
-define('CROWDSEC_LOG_PATH', CROWDSEC_PLUGIN_PATH.'/logs/crowdsec.log');
+$crowdsecRandomLogFolder = get_option('crowdsec_random_log_folder') ?: '';
+define('CROWDSEC_LOG_PATH', CROWDSEC_PLUGIN_PATH."/logs/$crowdsecRandomLogFolder/prod.log");
+define('CROWDSEC_DEBUG_LOG_PATH', CROWDSEC_PLUGIN_PATH."/logs/$crowdsecRandomLogFolder/debug.log");
 define('CROWDSEC_CACHE_PATH', CROWDSEC_PLUGIN_PATH.'/.cache');
 
 define('CROWDSEC_BOUNCING_LEVEL_DISABLED', 'bouncing_disabled');

inc/plugin-setup.php

@@ -31,6 +31,10 @@ function activate_crowdsec_plugin()
     update_option('crowdsec_hide_mentions', false);
     update_option('crowdsec_trust_ip_forward', '');
     update_option('crowdsec_trust_ip_forward_array', []);
+
+    if (!get_option('crowdsec_random_log_folder')) {
+        update_option('crowdsec_random_log_folder', bin2hex(random_bytes(64)));
+    }
 }
 
 /**