mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-07-31 10:20:14 +02:00
Code Issues Releases Wiki Activity

Merge pull request #100 from hason/socket

Browse Source 
Improved SocketHandler
This commit is contained in:
Jordi Boggiano
2012-08-10 07:00:18 -07:00
parent 4ab32e3363 535cea507f
commit ae31045917
2 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/Monolog/Handler/SocketHandler.php
View File

@@ -89,7 +89,7 @@ class SocketHandler extends AbstractProcessingHandler
/** /**
* Set connection timeout. Only has effect before we connect. * Set connection timeout. Only has effect before we connect.
* *
* @param integer $seconds * @param float $seconds
* *
* @see http://php.net/manual/en/function.fsockopen.php * @see http://php.net/manual/en/function.fsockopen.php
*/ */
@@ -102,14 +102,14 @@ class SocketHandler extends AbstractProcessingHandler
/** /**
* Set write timeout. Only has effect before we connect. * Set write timeout. Only has effect before we connect.
* *
* @param type $seconds * @param float $seconds
* *
* @see http://php.net/manual/en/function.stream-set-timeout.php * @see http://php.net/manual/en/function.stream-set-timeout.php
*/ */
public function setTimeout($seconds) public function setTimeout($seconds)
{ {
$this->validateTimeout($seconds); $this->validateTimeout($seconds);
$this->timeout = (int) $seconds; $this->timeout = (float) $seconds;
} }
/** /**
@@ -183,10 +183,15 @@ class SocketHandler extends AbstractProcessingHandler
/** /**
* Wrapper to allow mocking * Wrapper to allow mocking
*
* @see http://php.net/manual/en/function.stream-set-timeout.php
*/ */
protected function streamSetTimeout() protected function streamSetTimeout()
{ {
return stream_set_timeout($this->resource, $this->timeout); $seconds = floor($this->timeout);
$microseconds = round(($this->timeout - $seconds)*1e6);
return stream_set_timeout($this->resource, $seconds, $microseconds);
} }
/** /**
@@ -207,11 +212,9 @@ class SocketHandler extends AbstractProcessingHandler
private function validateTimeout($value) private function validateTimeout($value)
{ {
$ok = filter_var($value, FILTER_VALIDATE_INT, array('options' => array( $ok = filter_var($value, FILTER_VALIDATE_FLOAT);
'min_range' => 0, if ($ok === false || $value < 0) {
))); throw new \InvalidArgumentException("Timeout must be 0 or a positive float (got $value)");
if ($ok === false) {
throw new \InvalidArgumentException("Timeout must be 0 or a positive integer (got $value)");
} }
} }
@@ -254,7 +257,11 @@ class SocketHandler extends AbstractProcessingHandler
$length = strlen($data); $length = strlen($data);
$sent = 0; $sent = 0;
while ($this->isConnected() && $sent < $length) { while ($this->isConnected() && $sent < $length) {
$chunk = $this->fwrite(substr($data, $sent)); if (0 == $sent) {
$chunk = $this->fwrite($data);
} else {
$chunk = $this->fwrite(substr($data, $sent));
}
if ($chunk === false) { if ($chunk === false) {
throw new \RuntimeException("Could not write to socket"); throw new \RuntimeException("Could not write to socket");
} }

8
tests/Monolog/Handler/SocketHandlerTest.php
View File

@@ -50,8 +50,8 @@ class SocketHandlerTest extends TestCase
public function testSetConnectionTimeout() public function testSetConnectionTimeout()
{ {
$this->createHandler('localhost:1234'); $this->createHandler('localhost:1234');
$this->handler->setConnectionTimeout(10); $this->handler->setConnectionTimeout(10.1);
$this->assertEquals(10, $this->handler->getConnectionTimeout()); $this->assertEquals(10.1, $this->handler->getConnectionTimeout());
} }
/** /**
@@ -66,8 +66,8 @@ class SocketHandlerTest extends TestCase
public function testSetTimeout() public function testSetTimeout()
{ {
$this->createHandler('localhost:1234'); $this->createHandler('localhost:1234');
$this->handler->setTimeout(10); $this->handler->setTimeout(10.25);
$this->assertEquals(10, $this->handler->getTimeout()); $this->assertEquals(10.25, $this->handler->getTimeout());
} }
public function testSetConnectionString() public function testSetConnectionString()