From 02ccffda6b66f35eb57398eb94c2bfa1d35fb932 Mon Sep 17 00:00:00 2001 From: ssube Date: Tue, 12 Nov 2019 07:59:44 -0600 Subject: [PATCH] fix: log schema names correctly, do not log unmatched files --- src/rule/index.ts | 2 +- src/visitor/VisitorContext.ts | 2 +- test/rule/TestLoadRule.ts | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/rule/index.ts b/src/rule/index.ts index bd38654..41622ed 100644 --- a/src/rule/index.ts +++ b/src/rule/index.ts @@ -132,7 +132,7 @@ export async function loadRulePaths(paths: Array, ctx: VisitorContext): .filter((name) => name[0] !== '.') .filter((name) => match.match(name)); - ctx.logger.debug({ allFiles, files }, 'path matched files'); + ctx.logger.debug({ files }, 'path matched rule files'); const pathRules = await loadRuleFiles(files, ctx); rules.push(...pathRules); diff --git a/src/visitor/VisitorContext.ts b/src/visitor/VisitorContext.ts index 74c7161..93a7bc1 100644 --- a/src/visitor/VisitorContext.ts +++ b/src/visitor/VisitorContext.ts @@ -51,8 +51,8 @@ export class VisitorContext implements VisitorContextOptions, VisitorResult { public addSchema(name: string, schema: any): void { this.logger.debug({ - name, schema, + schemaName: name, }, 'adding ajv schema'); this.ajv.addSchema({ diff --git a/test/rule/TestLoadRule.ts b/test/rule/TestLoadRule.ts index 3b1755d..046a2ba 100644 --- a/test/rule/TestLoadRule.ts +++ b/test/rule/TestLoadRule.ts @@ -96,7 +96,6 @@ describeLeaks('load rule path helper', async () => { }); itLeaks('should recursively load rule files', async () => { - mockFS({ test: { 'bar-dir': {