From 6e59160c2c9a467500a09e8a096efd4edf24bf13 Mon Sep 17 00:00:00 2001 From: Michael Lumish Date: Wed, 8 Apr 2020 14:54:16 -0700 Subject: [PATCH] grpc-js: Fix status check when connecting to proxy --- packages/grpc-js/package.json | 2 +- packages/grpc-js/src/http_proxy.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/grpc-js/package.json b/packages/grpc-js/package.json index 7276e8c4..12f06052 100644 --- a/packages/grpc-js/package.json +++ b/packages/grpc-js/package.json @@ -1,6 +1,6 @@ { "name": "@grpc/grpc-js", - "version": "0.7.7", + "version": "0.7.8", "description": "gRPC Library for Node - pure JS implementation", "homepage": "https://grpc.io/", "repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js", diff --git a/packages/grpc-js/src/http_proxy.ts b/packages/grpc-js/src/http_proxy.ts index ecff1bb5..ab1083fc 100644 --- a/packages/grpc-js/src/http_proxy.ts +++ b/packages/grpc-js/src/http_proxy.ts @@ -58,7 +58,7 @@ function getProxyInfo(): ProxyInfo { try { proxyUrl = new URL(proxyEnv); } catch (e) { - log(LogVerbosity.INFO, `cannot parse value of "${envVar}" env var`); + log(LogVerbosity.ERROR, `cannot parse value of "${envVar}" env var`); return {}; } if (proxyUrl.protocol !== 'http:') { @@ -145,17 +145,17 @@ export function getProxiedConnection(target: string, subchannelAddress: Subchann request.once('connect', (res, socket, head) => { request.removeAllListeners(); socket.removeAllListeners(); - if (res.statusCode === http.STATUS_CODES.OK) { + if (res.statusCode === 200) { trace('Successfully connected to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address); resolve(socket); } else { - trace('Failed to connect to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address); + log(LogVerbosity.ERROR, 'Failed to connect to ' + subchannelAddress + ' through proxy ' + PROXY_INFO.address); reject(); } }); request.once('error', (err) => { request.removeAllListeners(); - trace('Failed to connect to proxy ' + PROXY_INFO.address); + log(LogVerbosity.ERROR, 'Failed to connect to proxy ' + PROXY_INFO.address); reject(); }); });