From 5ac7de5d7d1fd012171d848b1ffb1da00904fd61 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@kunena.org>
Date: Thu, 31 Mar 2016 14:21:36 +0300
Subject: [PATCH]  Replace LOG_DIR with log:// stream (#715)

---
 system/defines.php                               |  2 +-
 system/src/Grav/Common/Grav.php                  |  3 +--
 .../Common/Service/LoggerServiceProvider.php     | 16 ++++++++++++----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/system/defines.php b/system/defines.php
index 0aba2709d..e81c95143 100644
--- a/system/defines.php
+++ b/system/defines.php
@@ -14,7 +14,6 @@ define('ROOT_DIR', GRAV_ROOT . '/');
 define('USER_PATH', 'user/');
 define('USER_DIR', ROOT_DIR . USER_PATH);
 define('CACHE_DIR', ROOT_DIR . 'cache/');
-define('LOG_DIR', ROOT_DIR .'logs/');
 
 // DEPRECATED: Do not use!
 define('ASSETS_DIR', ROOT_DIR . 'assets/');
@@ -27,6 +26,7 @@ define('LIB_DIR', SYSTEM_DIR .'src/');
 define('PLUGINS_DIR', USER_DIR .'plugins/');
 define('THEMES_DIR', USER_DIR .'themes/');
 define('VENDOR_DIR', ROOT_DIR .'vendor/');
+define('LOG_DIR', ROOT_DIR .'logs/');
 // END DEPRECATED
 
 // Some extensions
diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 4917da357..bc27b87dd 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -84,8 +84,6 @@ class Grav extends Container
         $container['debugger'] = new Debugger();
         $container['debugger']->startTimer('_services', 'Services');
 
-        $container->register(new LoggerServiceProvider);
-
         $container->register(new ErrorServiceProvider);
 
         $container['uri'] = function ($c) {
@@ -199,6 +197,7 @@ class Grav extends Container
 
         $container->register(new StreamsServiceProvider);
         $container->register(new ConfigServiceProvider);
+        $container->register(new LoggerServiceProvider);
 
         $container['inflector'] = new Inflector();
 
diff --git a/system/src/Grav/Common/Service/LoggerServiceProvider.php b/system/src/Grav/Common/Service/LoggerServiceProvider.php
index edaf92178..1377bdd38 100644
--- a/system/src/Grav/Common/Service/LoggerServiceProvider.php
+++ b/system/src/Grav/Common/Service/LoggerServiceProvider.php
@@ -5,16 +5,24 @@ use Pimple\Container;
 use Pimple\ServiceProviderInterface;
 use \Monolog\Logger;
 use \Monolog\Handler\StreamHandler;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 class LoggerServiceProvider implements ServiceProviderInterface
 {
     public function register(Container $container)
     {
-        $log = new Logger('grav');
-        $log_file = LOG_DIR.'grav.log';
+        $container['log'] = function ($c) {
+            echo "LOG";
+            $log = new Logger('grav');
 
-        $log->pushHandler(new StreamHandler($log_file, Logger::DEBUG));
+            /** @var UniformResourceLocator $locator */
+            $locator = $c['locator'];
 
-        $container['log'] = $log;
+            $log_file = $locator->findResource('log://grav.log', true, true);
+
+            $log->pushHandler(new StreamHandler($log_file, Logger::DEBUG));
+
+            return $log;
+        };
     }
 }