Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #2725 : move logging directory path config to CodeIgniter\Log\Handlers\FileHandler config #2726

Merged
merged 10 commits into from
Mar 22, 2020
Merged

Fixes #2725 : move logging directory path config to CodeIgniter\Log\Handlers\FileHandler config #2726

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a01ab8d
Fixes #2725 : move logging directory path config to CodeIgniter\Log\H…
samsonasik Mar 20, 2020
581718c
check not isset config path log first
samsonasik Mar 20, 2020
cb40028
clean up logging property config
samsonasik Mar 20, 2020
b13705e
remove MockLogger::path property, move to MockLogger::$handlers[Tests…
samsonasik Mar 20, 2020
d7af143
update test to use $config->handlers[TestsSupportLogHandlersTestHandl…
samsonasik Mar 20, 2020
43cf579
FileHandlerTest::testBasicHandle() fix
samsonasik Mar 20, 2020
c8b9a5a
tweak log file creation via vfsstream
samsonasik Mar 20, 2020
99d4649
remove "Logger" doc comment
samsonasik Mar 20, 2020
a85fa14
fixed passed config parameter in FileHandlerTest
samsonasik Mar 20, 2020
f526510
use empty check for path log config
samsonasik Mar 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions app/Config/Logger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,6 @@ class Logger extends BaseConfig
*/
public $threshold = 3;

/*
|--------------------------------------------------------------------------
| Error Logging Directory Path
|--------------------------------------------------------------------------
| By default, logs are written to WRITEPATH . 'logs/'
| Specify a different destination here, if desired.
*/
public $path = '';

/*
|--------------------------------------------------------------------------
| Date Format for Logs
Expand Down Expand Up @@ -116,6 +107,14 @@ class Logger extends BaseConfig
* integer notation (i.e. 0700, 0644, etc.)
*/
'filePermissions' => 0644,

/*
* Error Logging Directory Path
samsonasik marked this conversation as resolved.
Show resolved Hide resolved
*
* By default, logs are written to WRITEPATH . 'logs/'
* Specify a different destination here, if desired.
*/
'path' => '',
],

/**
Expand Down
3 changes: 2 additions & 1 deletion system/Log/Handlers/FileHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ public function __construct(array $config = [])
{
parent::__construct($config);

$this->path = $config['path'] ?? WRITEPATH . 'logs/';
$config['path'] = $config['path'] ?? WRITEPATH . 'logs/';
$this->path = $config['path'] ?: WRITEPATH . 'logs/';
samsonasik marked this conversation as resolved.
Show resolved Hide resolved

$this->fileExtension = empty($config['fileExtension']) ? 'log' : $config['fileExtension'];
$this->fileExtension = ltrim($this->fileExtension, '.');
Expand Down
15 changes: 5 additions & 10 deletions system/Test/Mock/MockLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@ class MockLogger

public $threshold = 9;

/*
|--------------------------------------------------------------------------
| Error Logging Directory Path
|--------------------------------------------------------------------------
|
|
|
*/
public $path = '';

/*
|--------------------------------------------------------------------------
| Date Format for Logs
Expand Down Expand Up @@ -97,6 +87,11 @@ class MockLogger
'notice',
'warning',
],

/*
* Error Logging Directory Path
*/
'path' => '',
],
];

Expand Down