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

Merge pull request #1822 from murgatroid99/grpc-js_logging_backport

Browse Source 
grpc-js: Backport logging changes to 1.3.x
This commit is contained in:
Michael Lumish 2021-06-21 14:57:06 -07:00 committed by GitHub
commit db3bf70e21
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/package.json
View File

@ -1,6 +1,6 @@
{
"name": "@grpc/grpc-js",
"version": "1.3.2",
"version": "1.3.3",
"description": "gRPC Library for Node - pure JS implementation",
"homepage": "https://grpc.io/",
"repository": "https://github.com/grpc/grpc-node/tree/master/packages/grpc-js",

1
packages/grpc-js/src/constants.ts
View File

@ -39,6 +39,7 @@ export enum LogVerbosity {
DEBUG = 0,
INFO,
ERROR,
NONE,
}
/**

17
packages/grpc-js/src/logging.ts
View File

@ -32,6 +32,9 @@ switch (verbosityString.toUpperCase()) {
case 'ERROR':
_logVerbosity = LogVerbosity.ERROR;
break;
case 'NONE':
_logVerbosity = LogVerbosity.NONE;
break;
default:
// Ignore any other values
}
@ -56,15 +59,23 @@ export const log = (severity: LogVerbosity, ...args: any[]): void => {
};
const tracersString = process.env.GRPC_NODE_TRACE ?? process.env.GRPC_TRACE ?? '';
const enabledTracers = tracersString.split(',');
const allEnabled = enabledTracers.includes('all');
const enabledTracers = new Set<string>();
const disabledTracers = new Set<string>();
for (const tracerName of tracersString.split(',')) {
if (tracerName.startsWith('-')) {
disabledTracers.add(tracerName.substring(1));
} else {
enabledTracers.add(tracerName)
}
}
const allEnabled = enabledTracers.has('all');
export function trace(
severity: LogVerbosity,
tracer: string,
text: string
): void {
if (allEnabled || enabledTracers.includes(tracer)) {
if (!disabledTracers.has(tracer) && (allEnabled || enabledTracers.has(tracer))) {
log(severity, new Date().toISOString() + ' | ' + tracer + ' | ' + text);
}
}