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

Don't use tracer for ignored resource deletion logs

Browse Source
This commit is contained in:
Michael Lumish 2022-08-17 17:00:02 -07:00
parent 7ca0cc0069
commit a3b698e837
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/grpc-js-xds/src/xds-stream-state/xds-stream-state.ts
View File

@ -91,8 +91,8 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
constructor(private updateResourceNames: () => void) {}
protected trace(text: string, verbosity = logVerbosity.DEBUG) {
experimental.trace(verbosity, TRACER_NAME, this.getProtocolName() + ' | ' + text);
protected trace(text: string) {
experimental.trace(logVerbosity.DEBUG, TRACER_NAME, this.getProtocolName() + ' | ' + text);
}
private startResourceTimer(subscriptionEntry: SubscriptionEntry<ResponseType>) {
@ -146,7 +146,7 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
if (subscriptionEntry.watchers.length === 0) {
clearTimeout(subscriptionEntry.resourceTimer);
if (subscriptionEntry.deletionIgnored) {
this.trace('Unsubscribing from resource with previously ignored deletion: ' + resourceName, logVerbosity.INFO);
experimental.log(logVerbosity.INFO, 'Unsubscribing from resource with previously ignored deletion: ' + resourceName);
}
this.subscriptions.delete(resourceName);
this.updateResourceNames();
@ -194,7 +194,7 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
clearTimeout(subscriptionEntry.resourceTimer);
subscriptionEntry.cachedResponse = resource;
if (subscriptionEntry.deletionIgnored) {
this.trace('Received resource with previously ignored deletion: ' + resourceName, logVerbosity.INFO);
experimental.log(logVerbosity.INFO, 'Received resource with previously ignored deletion: ' + resourceName);
subscriptionEntry.deletionIgnored = false;
}
}
@ -230,7 +230,7 @@ export abstract class BaseXdsStreamState<ResponseType> implements XdsStreamState
if (!allResponseNames.has(resourceName) && subscriptionEntry.cachedResponse !== null) {
if (this.ignoreResourceDeletion) {
if (!subscriptionEntry.deletionIgnored) {
this.trace('Ignoring nonexistent resource ' + resourceName, logVerbosity.ERROR);
experimental.log(logVerbosity.ERROR, 'Ignoring nonexistent resource ' + resourceName);
subscriptionEntry.deletionIgnored = true;
}
} else {

2
packages/grpc-js/src/experimental.ts
View File

@ -1,4 +1,4 @@
export { trace } from './logging';
export { trace, log } from './logging';
export {
Resolver,
ResolverListener,