From 4786f4a0058029c8e71f4e9cc22c57e2b9479bc5 Mon Sep 17 00:00:00 2001 From: murgatroid99 Date: Mon, 2 Mar 2020 17:27:46 -0800 Subject: [PATCH] grpc_server_add_(in)secure_port returns 0 on error. Reflect that in bind(Async) --- packages/grpc-js/src/server.ts | 2 +- packages/grpc-native-core/src/server.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/grpc-js/src/server.ts b/packages/grpc-js/src/server.ts index a3274f14..d90a2c97 100644 --- a/packages/grpc-js/src/server.ts +++ b/packages/grpc-js/src/server.ts @@ -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); diff --git a/packages/grpc-native-core/src/server.js b/packages/grpc-native-core/src/server.js index 81e56347..e7fd2094 100644 --- a/packages/grpc-native-core/src/server.js +++ b/packages/grpc-native-core/src/server.js @@ -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);