Skip to content

Calculate stream timeout correctly #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
timsmid wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Calculate stream timeout correctly #135

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
61253a0
Only set the stream timeout once through setStreamTimeout
timsmid Jan 12, 2019
1aba85b
Remove unnecessary try-catch around stream timeout code
timsmid Jan 12, 2019
2ca1a9f
Remove number_format from stream timeout calculation
timsmid Jan 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 11 additions & 24 deletions src/Nats/Connection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,26 +168,20 @@ public function setChunkSize($chunkSize)
/**
* Set Stream Timeout.
*
* @param float $seconds Before timeout on stream.
* @param float $timeout Before timeout on stream.
*
* @return boolean
*/
public function setStreamTimeout($seconds)
public function setStreamTimeout($timeout)
{
if ($this->isConnected() === true) {
if (is_numeric($seconds) === true) {
try {
$timeout = number_format($seconds, 3);
$seconds = floor($timeout);
$microseconds = (($timeout - $seconds) * 1000);
return stream_set_timeout($this->streamSocket, $seconds, $microseconds);
} catch (\Exception $e) {
return false;
}
}
}
if ($this->isConnected() === false) return false;
if (is_numeric($timeout) === false) return false;

return false;
$seconds = intval($timeout);
if ($seconds < 0) return false;

$microseconds = intval(round($timeout - $seconds, 3) * 1000);
return stream_set_timeout($this->streamSocket, $seconds, $microseconds);
}

/**
Expand Down Expand Up @@ -227,12 +221,11 @@ public function isConnected()
* Returns an stream socket to the desired server.
*
* @param string $address Server url string.
* @param float $timeout Number of seconds until the connect() system call should timeout.
*
* @throws \Exception Exception raised if connection fails.
* @return resource
*/
private function getStream($address, $timeout, $context)
private function getStream($address, $context)
{
$errno = null;
$errstr = null;
Expand All @@ -250,11 +243,6 @@ function () {
throw Exception::forStreamSocketClientError($errstr, $errno);
}

$timeout = number_format($timeout, 3);
$seconds = floor($timeout);
$microseconds = (($timeout - $seconds) * 1000);
stream_set_timeout($fp, $seconds, $microseconds);

return $fp;
}

Expand Down Expand Up @@ -444,8 +432,7 @@ public function connect($timeout = null)
}

$this->timeout = $timeout;
$this->streamSocket = $this->getStream(
$this->options->getAddress(), $timeout, $this->options->getStreamContext());
$this->streamSocket = $this->getStream($this->options->getAddress(), $this->options->getStreamContext());
$this->setStreamTimeout($timeout);

$infoResponse = $this->receive();
Expand Down