Skip to content

Commit 19b299d

Browse files
committed
Simplify app and logger options
1 parent 22db271 commit 19b299d

5 files changed

Lines changed: 15 additions & 12 deletions

File tree

examples/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ const commands = [health]
1212

1313
const createAppContext = async (argv) => {
1414
const config = await getConfig(env)
15-
const logger = createLogger({ config })
16-
const app = createApp({ config, logger })
15+
const logger = createLogger(config)
16+
const app = createApp(logger, config)
1717
if (argv.start) await app.start()
1818
argv.app = app
1919
}

lib/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import { createServer } from 'node:http'
22

33
import { Daemon } from './daemon.js'
44

5-
export const createApp = ({ config, logger }) => new App({ config, logger })
5+
export const createApp = (logger, config) => new App(logger, config)
66

77
class App {
88
#daemon
99
#config
1010
#logger
1111

12-
constructor({ config, logger }) {
12+
constructor(logger, config) {
1313
this.#config = config
1414
this.#logger = logger
1515
}

lib/logger.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ import { Writable } from 'node:stream'
33
import { pino } from 'pino'
44
import pinoPretty from 'pino-pretty'
55

6-
export const createLogger = ({ t, config } = {}) => {
7-
const options = {}
8-
if (config?.logLevel != null) options.level = config.logLevel
9-
if (config?.useProductionLogger) return pino(options)
6+
export const createLogger = ({
7+
t,
8+
logLevel = 'info',
9+
useProductionLogger = false
10+
} = {}) => {
11+
const options = { level: logLevel }
12+
if (useProductionLogger) return pino(options)
1013
if (t != null) return createTestLogger(t, options)
1114
return pino(options, pinoPretty.default())
1215
}

server.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const args = await yargs(argv.slice(2))
2828
try {
2929
const { NODE_ENV } = args
3030
const config = await getConfig({ ...env, NODE_ENV })
31-
const logger = createLogger({ config })
32-
const app = createApp({ config, logger })
31+
const logger = createLogger(config)
32+
const app = createApp(logger, config)
3333
await app.start()
3434
logger.info(`Server: ${app.baseUrl}`)
3535
} catch (err) {

test/fixtures/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export const getTestApp = async (t) => {
2020
NODE_ENV: 'test',
2121
PORT: argv.includes('--smoke') ? env.PORT : port.toString()
2222
})
23-
const logger = createLogger({ config, t })
24-
const app = createApp({ config, logger })
23+
const logger = createLogger({ ...config, t })
24+
const app = createApp(logger, config)
2525
return app
2626
}

0 commit comments

Comments
 (0)