Ver Fonte

Merge branch '1.x'

Jordi Boggiano há 7 anos atrás
pai
commit
0193a07dd7
2 ficheiros alterados com 17 adições e 0 exclusões
  1. 2 0
      CHANGELOG.md
  2. 15 0
      src/Monolog/Handler/HipChatHandler.php

+ 2 - 0
CHANGELOG.md

@@ -10,7 +10,9 @@
   * Added SlackWebhookHandler::getWebhookUrl and SlackHandler::getToken to enable class extensibility
   * Added SwiftMailerHandler::getSubjectFormatter to enable class extensibility
   * Dropped official support for HHVM in test builds
+  * Fixed normalization of exception traces when call_user_func is used to avoid serializing objects and the data they contain
   * Fixed naming of fields in Slack handler, all field names are now capitalized in all cases
+  * Fixed HipChatHandler bug where slack dropped messages randomly
   * Fixed normalization of objects in Slack handlers
   * Fixed support for PHP7's Throwable in NewRelicHandler
   * Fixed race bug when StreamHandler sometimes incorrectly reported it failed to create a directory

+ 15 - 0
src/Monolog/Handler/HipChatHandler.php

@@ -188,6 +188,21 @@ class HipChatHandler extends SocketHandler
     protected function write(array $record)
     {
         parent::write($record);
+        $this->finalizeWrite();
+    }
+
+    /**
+     * Finalizes the request by reading some bytes and then closing the socket
+     *
+     * If we do not read some but close the socket too early, hipchat sometimes
+     * drops the request entirely.
+     */
+    protected function finalizeWrite()
+    {
+        $res = $this->getResource();
+        if (is_resource($res)) {
+            @fread($res, 2048);
+        }
         $this->closeSocket();
     }