mirror/php-monolog
1
0
Fork 0
mirror of https://github.com/Seldaek/monolog.git synced 2025-08-05 20:57:36 +02:00
Code Issues Releases Wiki Activity

Allow UdpSocket to reconnect after close()

Browse Source
This commit is contained in:
Jordi Boggiano
2022-05-10 10:19:45 +02:00
parent c709906d0a
commit 5d43fd52d3
2 changed files with 28 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/Monolog/Handler/SyslogUdp/UdpSocket.php
View File

@@ -23,20 +23,12 @@ class UdpSocket
/** @var int */ /** @var int */
protected $port; protected $port;
/** @var resource|Socket|null */ /** @var resource|Socket|null */
protected $socket; protected $socket = null;
public function __construct(string $ip, int $port = 514) public function __construct(string $ip, int $port = 514)
{ {
$this->ip = $ip; $this->ip = $ip;
$this->port = $port; $this->port = $port;
$domain = AF_INET;
$protocol = SOL_UDP;
// Check if we are using unix sockets.
if ($port === 0) {
$domain = AF_UNIX;
$protocol = IPPROTO_IP;
}
$this->socket = socket_create($domain, SOCK_DGRAM, $protocol) ?: null;
} }
/** /**
@@ -57,12 +49,34 @@ class UdpSocket
} }
} }
/**
* @return resource|Socket
*/
protected function getSocket()
{
if (null !== $this->socket) {
return $this->socket;
}
$domain = AF_INET;
$protocol = SOL_UDP;
// Check if we are using unix sockets.
if ($this->port === 0) {
$domain = AF_UNIX;
$protocol = IPPROTO_IP;
}
$this->socket = socket_create($domain, SOCK_DGRAM, $protocol) ?: null;
if (null === $this->socket) {
throw new \RuntimeException('The UdpSocket to '.$this->ip.':'.$this->port.' could not be opened via socket_create');
}
return $this->socket;
}
protected function send(string $chunk): void protected function send(string $chunk): void
{ {
if (!is_resource($this->socket) && !$this->socket instanceof Socket) { socket_sendto($this->getSocket(), $chunk, strlen($chunk), $flags = 0, $this->ip, $this->port);
throw new \RuntimeException('The UdpSocket to '.$this->ip.':'.$this->port.' has been closed and can not be written to anymore');
}
socket_sendto($this->socket, $chunk, strlen($chunk), $flags = 0, $this->ip, $this->port);
} }
protected function assembleMessage(string $line, string $header): string protected function assembleMessage(string $line, string $header): string

4
tests/Monolog/Handler/UdpSocketTest.php
View File

@@ -58,10 +58,8 @@ class UdpSocketTest extends TestCase
$socket->close(); $socket->close();
} }
public function testWriteAfterCloseErrors() public function testWriteAfterCloseReopened()
{ {
$this->expectException(\RuntimeException::class);
$socket = new UdpSocket('127.0.0.1', 514); $socket = new UdpSocket('127.0.0.1', 514);
$socket->close(); $socket->close();
$socket->write('foo', "HEADER"); $socket->write('foo', "HEADER");