Log signal info for #1569

the-djmaze · the-djmaze · commit 73ac962289d6 · 2024-04-30T02:26:20.000+02:00
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -206,17 +206,15 @@ public function __loggerShutDown() : void
 		}
 	}
 
-	public function signalHandler($signo)
+	public function signalHandler($signo, /*?array*/$siginfo = null)
 	{
 		if (\SIGTERM == $signo) {
 			exit;
 		}
-		if ($this->bUsed) {
-			foreach (static::$SIGNALS as $SIGNAL) {
-				if (\defined($SIGNAL) && \constant($SIGNAL) == $signo) {
-					$this->Write("Caught {$SIGNAL}");
-					break;
-				}
+		foreach (static::$SIGNALS as $SIGNAL) {
+			if (\defined($SIGNAL) && \constant($SIGNAL) == $signo) {
+				$this->Write("Caught {$SIGNAL} ".($siginfo ? \json_encode($siginfo) : ''), \LOG_CRIT, 'PHP');
+				break;
 			}
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -206,17 +206,15 @@ public function __loggerShutDown() : void`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
`209`		`- public function signalHandler($signo)`
	`209`	`+ public function signalHandler($signo, /?array/$siginfo = null)`
`210`	`210`	`{`
`211`	`211`	`if (\SIGTERM == $signo) {`
`212`	`212`	`exit;`
`213`	`213`	`}`
`214`		`- if ($this->bUsed) {`
`215`		`- foreach (static::$SIGNALS as $SIGNAL) {`
`216`		`- if (\defined($SIGNAL) && \constant($SIGNAL) == $signo) {`
`217`		`- $this->Write("Caught {$SIGNAL}");`
`218`		`- break;`
`219`		`- }`
	`214`	`+ foreach (static::$SIGNALS as $SIGNAL) {`
	`215`	`+ if (\defined($SIGNAL) && \constant($SIGNAL) == $signo) {`
	`216`	`+ $this->Write("Caught {$SIGNAL} ".($siginfo ? \json_encode($siginfo) : ''), \LOG_CRIT, 'PHP');`
	`217`	`+ break;`
`220`	`218`	`}`
`221`	`219`	`}`
`222`	`220`	`}`