From 67c33c347e29c48a2d36dfe15afe9094b9540e3e Mon Sep 17 00:00:00 2001 From: Robert Gust-Bardon Date: Tue, 11 Dec 2018 03:45:54 -0500 Subject: [PATCH 1/3] Fix the property for restarting syscalls (#1251) Credit goes to @gmponos for reporting the problem. --- src/Monolog/SignalHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Monolog/SignalHandler.php b/src/Monolog/SignalHandler.php index d5907805..d87018fe 100644 --- a/src/Monolog/SignalHandler.php +++ b/src/Monolog/SignalHandler.php @@ -96,7 +96,7 @@ class SignalHandler if ($this->previousSignalHandler[$signo] === true || $this->previousSignalHandler[$signo] === SIG_DFL) { if (extension_loaded('pcntl') && function_exists('pcntl_signal') && function_exists('pcntl_sigprocmask') && function_exists('pcntl_signal_dispatch') && extension_loaded('posix') && function_exists('posix_getpid') && function_exists('posix_kill')) { - $restartSyscalls = isset($this->restartSyscalls[$signo]) ? $this->restartSyscalls[$signo] : true; + $restartSyscalls = isset($this->signalRestartSyscalls[$signo]) ? $this->signalRestartSyscalls[$signo] : true; pcntl_signal($signo, SIG_DFL, $restartSyscalls); pcntl_sigprocmask(SIG_UNBLOCK, array($signo), $oldset); posix_kill(posix_getpid(), $signo); From fb48686cccdc2f1c114ec1d55eb9e7d2a37d3831 Mon Sep 17 00:00:00 2001 From: Jos Ahrens Date: Thu, 13 Dec 2018 09:52:31 +0100 Subject: [PATCH 2/3] Update README link of Python Logbook The old URL is no longer in use, serving "Logbook's documentation is maintained elsewhere." and a redirect. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d7569446..a578eb22 100644 --- a/README.md +++ b/README.md @@ -90,5 +90,5 @@ Monolog is licensed under the MIT License - see the `LICENSE` file for details ### Acknowledgements -This library is heavily inspired by Python's [Logbook](http://packages.python.org/Logbook/) +This library is heavily inspired by Python's [Logbook](https://logbook.readthedocs.io/en/stable/) library, although most concepts have been adjusted to fit to the PHP world. From 4e7dab4ffedcaddc95d3d3af05f91207d124faaf Mon Sep 17 00:00:00 2001 From: George Mponos Date: Thu, 13 Dec 2018 19:47:06 +0200 Subject: [PATCH 3/3] Deprecate slackbot handler --- src/Monolog/Handler/SlackbotHandler.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Monolog/Handler/SlackbotHandler.php b/src/Monolog/Handler/SlackbotHandler.php index baead525..d3352ea0 100644 --- a/src/Monolog/Handler/SlackbotHandler.php +++ b/src/Monolog/Handler/SlackbotHandler.php @@ -16,8 +16,11 @@ use Monolog\Logger; /** * Sends notifications through Slack's Slackbot * - * @author Haralan Dobrev - * @see https://slack.com/apps/A0F81R8ET-slackbot + * @author Haralan Dobrev + * @see https://slack.com/apps/A0F81R8ET-slackbot + * @deprecated According to Slack the API used on this handler it is deprecated. + * Therefore this handler will be removed on 2.x + * Slack suggests to use webhooks instead. Please contact slack for more information. */ class SlackbotHandler extends AbstractProcessingHandler { @@ -48,6 +51,7 @@ class SlackbotHandler extends AbstractProcessingHandler */ public function __construct($slackTeam, $token, $channel, $level = Logger::CRITICAL, $bubble = true) { + @trigger_error('SlackbotHandler is deprecated and will be removed on 2.x', E_USER_DEPRECATED); parent::__construct($level, $bubble); $this->slackTeam = $slackTeam;