File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 11import { getErrorMessage } from '@defra/forms-model'
22
33import { config } from '~/src/config/index.js'
4- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
4+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
55import { createServer } from '~/src/server/index.js'
66
7- const logger = createLogger ( )
8-
97process . on ( 'unhandledRejection' , ( error ) => {
108 const err = getErrorMessage ( error )
119 logger . info ( 'Unhandled rejection' )
Original file line number Diff line number Diff line change @@ -2,6 +2,10 @@ import { pino } from 'pino'
22
33import { loggerOptions } from '~/src/server/common/helpers/logging/logger-options.js'
44
5- export function createLogger ( ) {
5+ function createPinoLogger ( ) {
66 return pino ( loggerOptions )
77}
8+
9+ // Singleton logger instance - pino adds 'exit' listeners to process,
10+ // so we reuse a single instance to avoid MaxListenersExceededWarning
11+ export const logger = createPinoLogger ( )
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import { getErrorMessage } from '@defra/forms-model'
22import { Cluster , Redis } from 'ioredis'
33
44import { config } from '~/src/config/index.js'
5- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
5+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
66
77/**
88 * Setup Redis and provide a redis client
@@ -11,8 +11,6 @@ import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
1111 * Out in the wild - Elasticache / Redis Cluster with username and password
1212 */
1313export function buildRedisClient ( ) {
14- const logger = createLogger ( )
15-
1614 const port = 6379
1715 const db = 0
1816 const redisConfig = config . get ( 'redis' )
Original file line number Diff line number Diff line change 77import { StatusCodes } from 'http-status-codes'
88import joi , { type ObjectSchema } from 'joi'
99
10- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
10+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
1111import { COMPONENT_STATE_ERROR } from '~/src/server/constants.js'
1212import { FormComponent } from '~/src/server/plugins/engine/components/FormComponent.js'
1313import { type PaymentState } from '~/src/server/plugins/engine/components/PaymentField.types.js'
@@ -40,8 +40,6 @@ import {
4040 formatCurrency
4141} from '~/src/server/plugins/payment/helper.js'
4242
43- const logger = createLogger ( )
44-
4543export class PaymentField extends FormComponent {
4644 declare options : PaymentFieldComponent [ 'options' ]
4745 declare formSchema : ObjectSchema
Original file line number Diff line number Diff line change @@ -15,7 +15,7 @@ import { StatusCodes } from 'http-status-codes'
1515import { type Schema , type ValidationErrorItem } from 'joi'
1616import { Liquid } from 'liquidjs'
1717
18- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
18+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
1919import { FORM_VERSION_METADATA_KEY } from '~/src/server/constants.js'
2020import {
2121 getAnswer ,
@@ -37,8 +37,6 @@ import {
3737 type FormResponseToolkit
3838} from '~/src/server/routes/types.js'
3939
40- const logger = createLogger ( )
41-
4240export const engine = new Liquid ( {
4341 outputEscape : 'escape' ,
4442 jsTruthy : true ,
Original file line number Diff line number Diff line change @@ -28,7 +28,7 @@ import { add, format } from 'date-fns'
2828import { Parser , type Value } from 'expr-eval-fork'
2929import joi from 'joi'
3030
31- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
31+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
3232import { type ListFormComponent } from '~/src/server/plugins/engine/components/ListFormComponent.js'
3333import { } from '~/src/server/plugins/engine/components/YesNoField.js'
3434import {
@@ -61,8 +61,6 @@ import { FormAction } from '~/src/server/routes/types.js'
6161import { merge } from '~/src/server/services/cacheService.js'
6262import { type Services } from '~/src/server/types.js'
6363
64- const logger = createLogger ( )
65-
6664export class FormModel {
6765 /** The runtime engine that should be used */
6866 engine ?: Engine
Original file line number Diff line number Diff line change 11import { getErrorMessage } from '@defra/forms-model'
22import Joi from 'joi'
33
4- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
4+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
55import { CacheService } from '~/src/server/services/index.js'
66
7- const logger = createLogger ( )
8-
97const pluginRegistrationOptionsSchema = Joi . object ( {
108 model : Joi . object ( ) . optional ( ) ,
119 services : Joi . object ( ) . optional ( ) ,
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import Boom from '@hapi/boom'
22import { StatusCodes } from 'http-status-codes'
33import Joi from 'joi'
44
5- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
5+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
66import { EXTERNAL_STATE_APPENDAGE } from '~/src/server/constants.js'
77import { getPluginOptions } from '~/src/server/plugins/engine/helpers.js'
88import {
@@ -14,8 +14,6 @@ import {
1414export const PAYMENT_RETURN_PATH = '/payment-callback'
1515export const PAYMENT_SESSION_PREFIX = 'payment-'
1616
17- const logger = createLogger ( )
18-
1917/**
2018 * Flash form component state after successful payment
2119 * @param {Request } request - the request
Original file line number Diff line number Diff line change 11import { getErrorMessage } from '@defra/forms-model'
22import Boom from '@hapi/boom'
33
4- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
4+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
55import { getJson } from '~/src/server/services/httpService.js'
66
7- const logger = createLogger ( )
8-
97/**
108 * Returns an empty result set
119 */
Original file line number Diff line number Diff line change @@ -5,14 +5,12 @@ import Boom from '@hapi/boom'
55import { StatusCodes } from 'http-status-codes'
66
77import { config } from '~/src/config/index.js'
8- import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
8+ import { logger } from '~/src/server/common/helpers/logging/logger.js'
99import {
1010 checkFormStatus ,
1111 encodeUrl
1212} from '~/src/server/plugins/engine/helpers.js'
1313
14- const logger = createLogger ( )
15-
1614/** @type {Record<string, string> | undefined } */
1715let webpackManifest
1816
You can’t perform that action at this time.
0 commit comments