diff --git a/packages/grpc-native-core/binding.gyp b/packages/grpc-native-core/binding.gyp index 067eef482..72c35834e 100644 --- a/packages/grpc-native-core/binding.gyp +++ b/packages/grpc-native-core/binding.gyp @@ -91,7 +91,7 @@ 'GPR_BACKWARDS_COMPATIBILITY_MODE', 'GRPC_ARES=1', 'GRPC_UV', - 'GRPC_NODE_VERSION="1.24.5"', + 'GRPC_NODE_VERSION="1.24.7"', 'CARES_STATICLIB', 'CARES_SYMBOL_HIDING' ], diff --git a/packages/grpc-native-core/build.yaml b/packages/grpc-native-core/build.yaml index 57e9be41b..5fb681c08 100644 --- a/packages/grpc-native-core/build.yaml +++ b/packages/grpc-native-core/build.yaml @@ -1,3 +1,3 @@ settings: '#': It's possible to have node_version here as a key to override the core's version. - node_version: 1.24.5 + node_version: 1.24.7 diff --git a/packages/grpc-native-core/package.json b/packages/grpc-native-core/package.json index 511bc9399..c917c78d2 100644 --- a/packages/grpc-native-core/package.json +++ b/packages/grpc-native-core/package.json @@ -1,6 +1,6 @@ { "name": "grpc", - "version": "1.24.6", + "version": "1.24.7", "author": "Google Inc.", "description": "gRPC Library for Node", "homepage": "https://grpc.io/", diff --git a/packages/grpc-native-core/src/server.js b/packages/grpc-native-core/src/server.js index 737e43140..488de2d75 100644 --- a/packages/grpc-native-core/src/server.js +++ b/packages/grpc-native-core/src/server.js @@ -55,9 +55,6 @@ function handleError(call, error) { if (error.hasOwnProperty('details')) { status.details = error.details; } - if (status.code == constants.status.INTERNAL) { - common.log(constants.logVerbosity.ERROR, error); - } } if (error.hasOwnProperty('metadata')) { statusMetadata = error.metadata; @@ -97,6 +94,7 @@ function sendUnaryResponse(call, value, serialize, metadata, flags) { try { message = serialize(value); } catch (e) { + common.log(constants.logVerbosity.ERROR, e); e.code = constants.status.INTERNAL; handleError(call, e); return; @@ -310,6 +308,7 @@ function _write(chunk, encoding, callback) { try { message = this.serialize(chunk); } catch (e) { + common.log(constants.logVerbosity.ERROR, e); e.code = constants.status.INTERNAL; callback(e); return; @@ -400,6 +399,7 @@ function _read(size) { try { deserialized = self.deserialize(data); } catch (e) { + common.log(constants.logVerbosity.ERROR, e); e.code = constants.status.INTERNAL; self.emit('error', e); return; @@ -583,6 +583,7 @@ function handleUnary(call, handler, metadata) { try { emitter.request = handler.deserialize(result.read); } catch (e) { + common.log(constants.logVerbosity.ERROR, e); e.code = constants.status.INTERNAL; handleError(call, e); return; @@ -635,6 +636,7 @@ function handleServerStreaming(call, handler, metadata) { try { stream.request = handler.deserialize(result.read); } catch (e) { + common.log(constants.logVerbosity.ERROR, e); e.code = constants.status.INTERNAL; stream.emit('error', e); return; diff --git a/tools/release/cross/Dockerfile b/tools/release/cross/Dockerfile index 0cef4347b..3855314dc 100644 --- a/tools/release/cross/Dockerfile +++ b/tools/release/cross/Dockerfile @@ -3,7 +3,6 @@ FROM debian:stretch RUN dpkg --add-architecture i386 RUN apt-get update RUN apt-get install -y curl build-essential g++-aarch64-linux-gnu g++-arm-linux-gnueabihf g++-s390x-linux-gnu python libc6-dev:i386 lib32stdc++-6-dev -RUN curl -fsSL get.docker.com | bash RUN mkdir /usr/local/nvm ENV NVM_DIR /usr/local/nvm diff --git a/tools/release/native/Dockerfile b/tools/release/native/Dockerfile index 14a2e9a2d..a43e184f2 100644 --- a/tools/release/native/Dockerfile +++ b/tools/release/native/Dockerfile @@ -6,7 +6,6 @@ RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt RUN apt-get update RUN apt-get -t jessie-backports install -y cmake RUN apt-get install -y curl build-essential python libc6-dev-i386 lib32stdc++-4.9-dev jq -RUN curl -fsSL get.docker.com | bash RUN mkdir /usr/local/nvm ENV NVM_DIR /usr/local/nvm