Fix log output in acceptance tests

SmartBear · Mar 4, 2021 · 8a75b20 · 8a75b20
1 parent 25d0e7f
commit 8a75b20
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 9 deletions.
diff --git a/packages/acceptance-tests/src/step_definitions/steps.ts b/packages/acceptance-tests/src/step_definitions/steps.ts
@@ -223,6 +223,7 @@ Then(
 )
 
 Then('the repo should have been fetched', async function (this: World) {
+  // TODO: resolve duplication with the "fetched n times" step below
   await promiseThat(
     new Promise<void>((received) =>
       this.domainEvents.on('repo.fetched', (event) => event.repoId.equals(this.repoId) && received())

diff --git a/packages/acceptance-tests/src/support/abilities/app.ts b/packages/acceptance-tests/src/support/abilities/app.ts
@@ -8,12 +8,14 @@ import { dirSync } from 'tmp'
 
 import { LaBoîte } from 'git-en-boite-app'
 import { World } from '../world'
+import { setUpLogger } from 'git-en-boite-logging'
+const config = createConfig()
+console.log('Starting acceptance tests with config:\n', JSON.stringify(config, null, 2))
 
 Before(async function (this: World) {
   this.domainEvents = new EventEmitter()
-  const config = createConfig()
+  this.log = setUpLogger({}, config.logger)
   const gitReposPath = dirSync().name
   const repoIndex = new InventoryOfReposOnDisk(gitReposPath, new DirectLocalClones(), this.domainEvents)
-  const log = () => ({})
-  this.app = new LaBoîte(repoIndex, config.version, this.domainEvents, [fetchRepoAfterConnected], log)
+  this.app = new LaBoîte(repoIndex, config.version, this.domainEvents, [fetchRepoAfterConnected], this.log)
 })
diff --git a/packages/acceptance-tests/src/support/abilities/request.ts b/packages/acceptance-tests/src/support/abilities/request.ts
@@ -6,10 +6,8 @@ import { World } from '../world'
 
 let webServer: Server
 
-const log = process.env.show_logs ? console.log : () => ({})
-
 Before(function (this: World) {
-  webServer = startWebServer(this.app, 8888, log)
+  webServer = startWebServer(this.app, 8888, this.log)
   this.request = request(webServer)
 })
 

diff --git a/packages/acceptance-tests/src/support/world.ts b/packages/acceptance-tests/src/support/world.ts
@@ -1,8 +1,9 @@
-import { Application, CommitName, DomainEventBus, GitFile, RemoteUrl, RepoId } from 'git-en-boite-core'
+import { Application, CommitName, DomainEventBus, GitFile, RemoteUrl, RepoId, WriteLogEvent } from 'git-en-boite-core'
 import { Response, SuperTest, Test } from 'supertest'
 
 export type World = {
   domainEvents: DomainEventBus
+  log: WriteLogEvent
   repoId: RepoId
   lastCommitRevision: CommitName
   lastResponse: Response

diff --git a/packages/config/src/config.ts b/packages/config/src/config.ts
@@ -36,7 +36,12 @@ const createRedisConfig = (env: ReadableEnvironment): string => {
 
 const createLoggerConfig = (env: ReadableEnvironment): LoggerOptions => {
   return {
-    readableBy: env.get('NODE_ENV').required().asString() === 'production' ? 'machines' : 'humans',
+    readableBy:
+      env.get('NODE_ENV').required().asString() === 'production'
+        ? 'machines'
+        : env.get('show_logs').asBool()
+        ? 'humans'
+        : 'nobody',
   }
 }
 

diff --git a/packages/logging/src/index.ts b/packages/logging/src/index.ts
@@ -7,6 +7,10 @@ export * from './makeHttpLoggingMiddleware'
 export * from './LoggerOptions'
 
 export function setUpLogger(config: pino.Bindings, { readableBy }: LoggerOptions): WriteLogEvent {
-  const logger = readableBy === 'humans' ? pino({ prettyPrint: { colorize: true } }) : pino()
+  const logger = {
+    machine: pino(),
+    humans: pino({ prettyPrint: { colorize: true } }),
+    nobody: pino({ level: 'silent' }),
+  }[readableBy]
   return logToPino(logger.child(config))
 }