Skip to content

[5.4] Fix log format configurations #46422

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

Open
wants to merge 1 commit into
base: 5.4-dev
Choose a base branch
from
+5 −12
Open

[5.4] Fix log format configurations #46422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions administrator/components/com_finder/src/Controller/IndexerController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ public function start()
$dispatcher = $this->getDispatcher();

if ($params->get('enable_logging', '0')) {
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'indexer.php';
Log::addLogger($options);
}
Expand Down Expand Up @@ -129,7 +128,6 @@ public function batch()
$dispatcher = $this->getDispatcher();

if ($params->get('enable_logging', '0')) {
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'indexer.php';
Log::addLogger($options);
}
Expand Down Expand Up @@ -284,7 +282,6 @@ public static function sendResponse($data = null)
$params = ComponentHelper::getParams('com_finder');

if ($params->get('enable_logging', '0')) {
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'indexer.php';
Log::addLogger($options);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_finder/src/Response/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ public function __construct($state)
$params = ComponentHelper::getParams('com_finder');

if ($params->get('enable_logging', '0')) {
$options['format'] = '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}';
$options['text_file'] = 'indexer.php';
Log::addLogger($options);
}
Expand Down
1 change: 0 additions & 1 deletion administrator/components/com_joomlaupdate/src/Model/UpdateModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ public function __construct($config = [], ?MVCFactoryInterface $factory = null)

// Register a logger for update process
$options = [
'format' => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
'text_file' => 'joomla_update.php',
];

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_scheduler/src/Scheduler/Scheduler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function runTask(array $options): ?Task

$app->getLanguage()->load('com_scheduler', JPATH_ADMINISTRATOR);

$options['text_entry_format'] = '{DATE} {TIME} {PRIORITY} {MESSAGE}';
$options['text_entry_format'] = "{DATE}\t{TIME}\t{PRIORITY}\t{MESSAGE}";
$options['text_file'] = 'joomla_scheduler.php';
Log::addLogger($options, Log::ALL, $task->logCategory);

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_scheduler/src/Task/Task.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ public function __construct(object $record)
if ($this->get('params.individual_log')) {
$logFile = $this->get('params.log_file') ?? 'task_' . $this->get('id') . '.log.php';

$options['text_entry_format'] = '{DATE} {TIME} {PRIORITY} {MESSAGE}';
$options['text_entry_format'] = "{DATE}\t{TIME}\t{PRIORITY}\t{MESSAGE}";
$options['text_file'] = $logFile;
Log::addLogger($options, Log::ALL, [$this->logCategory]);
}
Expand Down
1 change: 0 additions & 1 deletion installation/includes/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
if (is_writable(JPATH_ADMINISTRATOR . '/logs')) {
\Joomla\CMS\Log\Log::addLogger(
[
'format' => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
'text_file' => 'error.php',
],
\Joomla\CMS\Log\Log::ALL,
Expand Down
1 change: 0 additions & 1 deletion installation/includes/cli.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
if (is_writable(JPATH_ADMINISTRATOR . '/logs')) {
\Joomla\CMS\Log\Log::addLogger(
[
'format' => '{DATE}\t{TIME}\t{LEVEL}\t{CODE}\t{MESSAGE}',
'text_file' => 'error.php',
],
\Joomla\CMS\Log\Log::ALL,
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Log/Logger/FormattedtextLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ class FormattedtextLogger extends Logger
* @var string
* @since 1.7.0
*/
protected $format = '{DATETIME} {PRIORITY} {CLIENTIP} {CATEGORY} {MESSAGE}';
protected $format = "{DATETIME}\t{PRIORITY}\t{CLIENTIP}\t{CATEGORY}\t{MESSAGE}";

/**
* The parsed fields from the format string.
Expand Down
2 changes: 1 addition & 1 deletion libraries/src/Log/Logger/W3cLogger.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class W3cLogger extends FormattedtextLogger
* @var string
* @since 1.7.0
*/
protected $format = '{DATE} {TIME} {PRIORITY} {CLIENTIP} {CATEGORY} {MESSAGE}';
protected $format = "{DATE}\t{TIME}\t{PRIORITY}\t{CLIENTIP}\t{CATEGORY}\t{MESSAGE}";

/**
* Constructor.
Expand Down
2 changes: 1 addition & 1 deletion plugins/system/webauthn/src/Extension/Webauthn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public function __construct(array $config = [], ?Authentication $authHelper = nu

Log::addLogger([
'text_file' => "webauthn_system.php",
'text_entry_format' => '{DATETIME} {PRIORITY} {CLIENTIP} {MESSAGE}',
'text_entry_format' => "{DATETIME}\t{PRIORITY}\t{CLIENTIP}\t{MESSAGE}",
], $logLevels, ["webauthn.system"]);

$this->authenticationHelper = $authHelper ?? (new Authentication());
Expand Down