archive-gh-me/grpc-node
1
0
Fork 0
mirror of https://github.com/grpc/grpc-node.git synced 2025-12-08 18:23:54 +00:00
Code Issues Projects Releases Wiki Activity

grpc_server_add_(in)secure_port returns 0 on error. Reflect that in bind(Async)

Browse Source
This commit is contained in:
murgatroid99 2020-03-02 17:27:46 -08:00
parent 8f32516d2d
commit 4786f4a005
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/src/server.ts
View File

@ -240,7 +240,7 @@ export class Server {
this._setupHandlers();
function onError(err: Error): void {
callback(err, -1);
callback(err, 0);
}
this.http2Server.once('error', onError);

6
packages/grpc-native-core/src/server.js
View File

@ -970,7 +970,7 @@ Server.prototype.addProtoService = util.deprecate(function(service,
* "address:port"
* @param {grpc.ServerCredentials} creds Server credential object to be used for
* SSL. Pass an insecure credentials object for an insecure port.
* @return {number} The bound port number. Negative if binding the port failed.
* @return {number} The bound port number. Zero if binding the port failed.
*/
Server.prototype.bind = function(port, creds) {
if (this.started) {
@ -984,7 +984,7 @@ Server.prototype.bind = function(port, creds) {
* @callback grpc.Server~bindCallback
* @param {Error=} error If non-null, indicates that binding the port failed.
* @param {number} port The bound port number. If binding the port fails, this
* will be negative to match the output of bind.
* will be zero to match the output of bind.
*/
/**
@ -1000,7 +1000,7 @@ Server.prototype.bindAsync = function(port, creds, callback) {
* incorrect use of the function, which should not be surfaced asynchronously
*/
const result = this.bind(port, creds)
if (result < 0) {
if (result == 0) {
setImmediate(callback, new Error('Failed to bind port'), result);
} else {
setImmediate(callback, null, result);