From bd72383ab1a5742d3ddc102fd3a1b0d4d7d9f2a1 Mon Sep 17 00:00:00 2001 From: Christian Weiske Date: Sun, 21 Jun 2015 06:28:40 +0200 Subject: [PATCH] try to handle nightly debug port resets --- src/callnotifier/Exception/ConnectionReset.php | 11 +++++++++++ src/callnotifier/Source/Remote.php | 18 +++++++++++++++--- 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 src/callnotifier/Exception/ConnectionReset.php diff --git a/src/callnotifier/Exception/ConnectionReset.php b/src/callnotifier/Exception/ConnectionReset.php new file mode 100644 index 0000000..a7bf139 --- /dev/null +++ b/src/callnotifier/Exception/ConnectionReset.php @@ -0,0 +1,11 @@ + \ No newline at end of file diff --git a/src/callnotifier/Source/Remote.php b/src/callnotifier/Source/Remote.php index 39b042c..4145c59 100644 --- a/src/callnotifier/Source/Remote.php +++ b/src/callnotifier/Source/Remote.php @@ -13,9 +13,16 @@ class Source_Remote public function run() { - $this->connect($this->config->host, $this->config->port); - $this->init(); - $this->loop(); + do { + try { + $tryAgain = false; + $this->connect($this->config->host, $this->config->port); + $this->init(); + $this->loop(); + } catch (\Exception_ConnectionReset $e) { + $tryAgain = true; + } + } while ($tryAgain); $this->disconnect(); } @@ -64,6 +71,11 @@ class Source_Remote function read_response() { $res = socket_read($this->socket, 2048, PHP_NORMAL_READ); + if ($res === false) { + //handle "Connection reset by peer" that appears nightly since + // version 4.0N + throw new Exception_ConnectionReset(); + } return substr($res, 2, -1); } -- 2.30.2