Skip to content

Update RequestTrait.php #253

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
gfh31fgh2 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update RequestTrait.php #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 22 additions & 3 deletions src/Traits/RequestTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ protected function doRequest($service, $method, array $data = [])
json_decode($request->serializeToJsonString(), true)
);

$call = $this->client->$method($request, $this->meta);
$options = $this->buildGrpcOptions();
$call = $this->client->$method($request, $this->meta, $options);

if (method_exists($call, 'wait')) {
list($response, $status) = $call->wait();
Expand Down Expand Up @@ -152,7 +153,8 @@ protected function doStreamRequest($service, $method, $data = [])

$request = new $requestClass($data);

$call = $this->client->$method($request, $this->meta);
$options = $this->buildGrpcOptions();
$call = $this->client->$method($request, $this->meta, $options);

if (method_exists($call, 'responses')) {
// $status = $call->getStatus();
Expand Down Expand Up @@ -238,7 +240,7 @@ protected function processResponse($service, $method, $response, $resultClass)
$this->logger()->debug('YDB: Received API response [' . $resultClass . '].', json_decode($jsonResult, true));

$result = new $resultClass;
$result->mergeFromJsonString($jsonResult, true);
$result->mergeFromJsonString($jsonResult);
}
}

Expand Down Expand Up @@ -323,6 +325,23 @@ protected function checkDiscovery(){
}
}

/**
* Build gRPC call options including timeout if configured
*
* @return array
*/
protected function buildGrpcOptions()
{
$options = [];

$timeout = $this->ydb->getGrpcTimeout();
if ($timeout !== null) {
$options['timeout'] = $timeout;
}

return $options;
}

public static $ydbExceptions = [
StatusCode::STATUS_CODE_UNSPECIFIED => \YdbPlatform\Ydb\Exceptions\Ydb\StatusCodeUnspecified::class,
StatusCode::BAD_REQUEST => \YdbPlatform\Ydb\Exceptions\Ydb\BadRequestException::class,
Expand Down