From 2c9c712bec89fcaca4fc3def974a0975bd3b5770 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 31 Mar 2016 14:03:43 +0300 Subject: [PATCH 1/4] Deprecate SYSTEM_DIR constant --- system/defines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/defines.php b/system/defines.php index 7d1ce424a..0aba2709d 100644 --- a/system/defines.php +++ b/system/defines.php @@ -13,7 +13,6 @@ if (!defined('GRAV_ROOT')) { define('ROOT_DIR', GRAV_ROOT . '/'); define('USER_PATH', 'user/'); define('USER_DIR', ROOT_DIR . USER_PATH); -define('SYSTEM_DIR', ROOT_DIR .'system/'); define('CACHE_DIR', ROOT_DIR . 'cache/'); define('LOG_DIR', ROOT_DIR .'logs/'); @@ -23,6 +22,7 @@ define('IMAGES_DIR', ROOT_DIR . 'images/'); define('ACCOUNTS_DIR', USER_DIR .'accounts/'); define('PAGES_DIR', USER_DIR .'pages/'); define('DATA_DIR', USER_DIR .'data/'); +define('SYSTEM_DIR', ROOT_DIR .'system/'); define('LIB_DIR', SYSTEM_DIR .'src/'); define('PLUGINS_DIR', USER_DIR .'plugins/'); define('THEMES_DIR', USER_DIR .'themes/'); From 5ac7de5d7d1fd012171d848b1ffb1da00904fd61 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 31 Mar 2016 14:21:36 +0300 Subject: [PATCH 2/4] 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; + }; } } From 51ee7eef24938b68b2c6980b57ba960d5033da70 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 31 Mar 2016 14:37:50 +0300 Subject: [PATCH 3/4] Remove extra debug message --- system/src/Grav/Common/Service/LoggerServiceProvider.php | 1 - 1 file changed, 1 deletion(-) diff --git a/system/src/Grav/Common/Service/LoggerServiceProvider.php b/system/src/Grav/Common/Service/LoggerServiceProvider.php index 1377bdd38..75affc985 100644 --- a/system/src/Grav/Common/Service/LoggerServiceProvider.php +++ b/system/src/Grav/Common/Service/LoggerServiceProvider.php @@ -12,7 +12,6 @@ class LoggerServiceProvider implements ServiceProviderInterface public function register(Container $container) { $container['log'] = function ($c) { - echo "LOG"; $log = new Logger('grav'); /** @var UniformResourceLocator $locator */ From da6a91f1327105b97f25a056c46cf95b75e781af Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 31 Mar 2016 14:40:13 +0300 Subject: [PATCH 4/4] Fix wrong page_cache_id on multisite --- system/src/Grav/Common/Page/Pages.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Pages.php b/system/src/Grav/Common/Page/Pages.php index fb98932db..e70118e58 100644 --- a/system/src/Grav/Common/Page/Pages.php +++ b/system/src/Grav/Common/Page/Pages.php @@ -704,7 +704,7 @@ class Pages $last_modified = Folder::lastModifiedFile($pages_dir); } - $page_cache_id = md5(USER_DIR . $last_modified . $language->getActive() . $config->checksum()); + $page_cache_id = md5($pages_dir . $last_modified . $language->getActive() . $config->checksum()); list($this->instances, $this->routes, $this->children, $taxonomy_map, $this->sort) = $cache->fetch($page_cache_id); if (!$this->instances) {