Skip to content
Snippets Groups Projects
Commit 9ae6dbd4 authored by catch's avatar catch
Browse files

Issue #3333215 by enchufe, arunkumark, mfb, Nitin shrivastava, smustgrave,...

Issue #3333215 by enchufe, arunkumark, mfb, Nitin shrivastava, smustgrave, cilefen: Return early if syslog configs are NULL to avoid openlog deprecation

(cherry picked from commit 5ce13375)
parent 5e775aae
No related branches found
No related tags found
20 merge requests!11628Update file MediaLibraryWidget.php,!7564Revert "Issue #3364773 by roshnichordiya, Chris Matthews, thakurnishant_06,...,!5752Issue #3275828 by joachim, quietone, bradjones1, Berdir: document the reason...,!5627Issue #3261805: Field not saved when change of 0 on string start,!5427Issue #3338518: send credentials in ajax if configured in CORS settings.,!5395Issue #3387916 by fjgarlin, Spokje: Each GitLab job exposes user email,!5217Issue #3386607 by alexpott: Improve spell checking in commit-code-check.sh,!5064Issue #3379522 by finnsky, Gauravvvv, kostyashupenko, smustgrave, Chi: Revert...,!5040SDC ComponentElement: Transform slots scalar values to #plain_text instead of throwing an exception,!4958Issue #3392147: Whitelist IP for a Ban module.,!4894Issue #3280279: Add API to allow sites to opt in to upload SVG images in CKEditor 5,!4857Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!4856Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!4788Issue #3272985: RSS Feed header reverts to text/html when cached,!4716Issue #3362929: Improve 400 responses for broken/invalid image style routes,!4553Draft: Issue #2980951: Permission to see own unpublished comments in comment thread,!3679Issue #115801: Allow password on registration without disabling e-mail verification,!3106Issue #3017548: "Filtered HTML" text format does not support manual teaser break (<!--break-->),!925Issue #2339235: Remove taxonomy hard dependency on node module,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links
......@@ -52,8 +52,13 @@ public function __construct(ConfigFactoryInterface $config_factory, LogMessagePa
*/
protected function openConnection() {
if (!$this->connectionOpened) {
// Do not connect if identity or facility are not configured.
$identity = $this->config->get('identity');
$facility = $this->config->get('facility');
$this->connectionOpened = openlog($this->config->get('identity'), LOG_NDELAY, $facility);
if ($identity === NULL || $facility === NULL) {
return;
}
$this->connectionOpened = openlog($identity, LOG_NDELAY, $facility);
}
}
......@@ -73,6 +78,9 @@ public function log($level, string|\Stringable $message, array $context = []): v
// Ensure we have a connection available.
$this->openConnection();
if (!$this->connectionOpened) {
return;
}
// Populate the message placeholders and then replace them in the message.
$message_placeholders = $this->parser->parseMessagePlaceholders($message, $context);
......
......@@ -62,6 +62,20 @@ public function testSyslogWriting() {
$this->assertFileDoesNotExist($log_filename);
}
/**
* Tests that missing facility prevents writing to the syslog.
*
* @covers ::openConnection
*/
public function testSyslogMissingFacility() {
$config = $this->container->get('config.factory')->getEditable('syslog.settings');
$config->clear('facility');
$config->save();
\Drupal::logger('my_module')->warning('My warning message.');
$log_filename = $this->container->get('file_system')->realpath('public://syslog.log');
$this->assertFileDoesNotExist($log_filename);
}
/**
* Tests severity level logging.
*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment