grpc
/
grpc-node
mirror of https://github.com/grpc/grpc-node.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add separate trace and verbosity env variables for this library

This commit is contained in:
Michael Lumish 2020-08-21 09:46:45 -07:00
parent f4e9b63ddf
commit 14eea7d6d2
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/grpc-js/scripts/xds.sh
View File

@ -19,7 +19,7 @@ grpc/tools/run_tests/helper_scripts/prep_xds.sh
# #
# TODO: remove "path_matching" and "header_matching" from --test_case after # TODO: remove "path_matching" and "header_matching" from --test_case after
# they are added into "all". # they are added into "all".
GRPC_TRACE=all GRPC_VERBOSITY=DEBUG \ GRPC_NODE_TRACE=all GRPC_NODE_VERBOSITY=DEBUG \
python3 grpc/tools/run_tests/run_xds_tests.py \ python3 grpc/tools/run_tests/run_xds_tests.py \
--test_case="all" \ --test_case="all" \
--project_id=grpc-testing \ --project_id=grpc-testing \

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

@ -20,20 +20,20 @@ import { LogVerbosity } from './constants';
let _logger: Partial<Console> = console; let _logger: Partial<Console> = console;
let _logVerbosity: LogVerbosity = LogVerbosity.ERROR; let _logVerbosity: LogVerbosity = LogVerbosity.ERROR;
if (process.env.GRPC_VERBOSITY) { const verbosityString = process.env.GRPC_NODE_VERBOSITY ?? process.env.GRPC_VERBOSITY ?? '';
switch (process.env.GRPC_VERBOSITY) {
case 'DEBUG': switch (verbosityString) {
_logVerbosity = LogVerbosity.DEBUG; case 'DEBUG':
break; _logVerbosity = LogVerbosity.DEBUG;
case 'INFO': break;
_logVerbosity = LogVerbosity.INFO; case 'INFO':
break; _logVerbosity = LogVerbosity.INFO;
case 'ERROR': break;
_logVerbosity = LogVerbosity.ERROR; case 'ERROR':
break; _logVerbosity = LogVerbosity.ERROR;
default: break;
// Ignore any other values default:
} // Ignore any other values
} }
export const getLogger = (): Partial<Console> => { export const getLogger = (): Partial<Console> => {
@ -55,9 +55,8 @@ export const log = (severity: LogVerbosity, ...args: any[]): void => {
} }
}; };
const enabledTracers = process.env.GRPC_TRACE const tracersString = process.env.GRPC_NODE_TRACE ?? process.env.GRPC_TRACE ?? '';
? process.env.GRPC_TRACE.split(',') const enabledTracers = tracersString.split(',');
: [];
const allEnabled = enabledTracers.includes('all'); const allEnabled = enabledTracers.includes('all');
export function trace( export function trace(