Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 46 additions & 32 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"@aws-sdk/client-sns": "^3.997.0",
"@defra/forms-engine-plugin": "^4.9.1",
"@defra/forms-engine-plugin": "^4.10.0",
"@defra/forms-model": "^3.0.647",
"@defra/hapi-tracing": "^1.30.0",
"@elastic/ecs-pino-format": "^1.5.0",
Expand Down
4 changes: 1 addition & 3 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { getErrorMessage } from '@defra/forms-model'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'
import { createServer } from '~/src/server/index.js'

const logger = createLogger()

process.on('unhandledRejection', (err) => {
logger.info('Unhandled rejection')
logger.error(
Expand Down
6 changes: 5 additions & 1 deletion src/server/common/helpers/logging/logger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ import { pino } from 'pino'

import { loggerOptions } from '~/src/server/common/helpers/logging/logger-options.js'

export function createLogger() {
function createPinoLogger() {
return pino(loggerOptions)
}

// Singleton logger instance - pino adds 'exit' listeners to process,
// so we reuse a single instance to avoid MaxListenersExceededWarning
export const logger = createPinoLogger()
4 changes: 1 addition & 3 deletions src/server/common/helpers/redis-client.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { getErrorMessage } from '@defra/forms-model'
import { Cluster, Redis } from 'ioredis'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'

/**
* Setup Redis and provide a redis client
Expand All @@ -11,8 +11,6 @@ import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
* Out in the wild - Elasticache / Redis Cluster with username and password
*/
export function buildRedisClient() {
const logger = createLogger()

const port = 6379
const db = 0
const redisConfig = config.get('redis')
Expand Down
3 changes: 1 addition & 2 deletions src/server/messaging/formAdapterEventPublisher.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,9 @@ import { formAdapterSubmissionMessagePayloadSchema } from '@defra/forms-engine-p
import { type FormAdapterSubmissionMessagePayload } from '@defra/forms-engine-plugin/engine/types.js'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'
import { getSNSClient } from '~/src/server/messaging/sns.js'

const logger = createLogger()
const snsAdapterTopicArn = config.get('snsAdapterTopicArn')
const snsFormTopicArnMapRaw = config.get('snsFormTopicArnMap')
const snsFormTopicArnMap: Record<string, string> = snsFormTopicArnMapRaw
Expand Down
4 changes: 1 addition & 3 deletions src/server/messaging/publish-base.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import { PublishCommand } from '@aws-sdk/client-sns'

import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'
import { getSNSClient } from '~/src/server/messaging/sns.js'

const logger = createLogger()

const snsSaveTopicArn = config.get('snsSaveTopicArn')

const client = getSNSClient()
Expand Down
4 changes: 1 addition & 3 deletions src/server/plugins/nunjucks/context.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@ import { StatusCodes } from 'http-status-codes'
import pkg from '~/package.json' with { type: 'json' }
import { parseCookieConsent } from '~/src/common/cookies.js'
import { config } from '~/src/config/index.js'
import { createLogger } from '~/src/server/common/helpers/logging/logger.js'

const logger = createLogger()
import { logger } from '~/src/server/common/helpers/logging/logger.js'

/** @type {Record<string, string> | undefined} */
let webpackManifest
Expand Down
3 changes: 1 addition & 2 deletions src/server/routes/save-and-exit.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import * as Hoek from '@hapi/hoek'
import { StatusCodes } from 'http-status-codes'
import Joi from 'joi'

import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'
import { createJoiError } from '~/src/server/helpers/error-helper.js'
import { publishSaveAndExitEvent } from '~/src/server/messaging/publish.js'
import {
Expand All @@ -38,7 +38,6 @@ import {
getSaveAndExitDetails,
validateSaveAndExitCredentials
} from '~/src/server/services/formsService.js'
const logger = createLogger()

const maxInvalidPasswordAttempts = 5

Expand Down
4 changes: 2 additions & 2 deletions src/server/services/outputService.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import {
jest.mock('@defra/forms-engine-plugin/engine/helpers.js')
jest.mock('@defra/forms-engine-plugin/engine/outputFormatters/index.js')
jest.mock('~/src/server/common/helpers/logging/logger.ts', () => ({
createLogger: jest.fn(() => ({
logger: {
info: jest.fn(),
error: jest.fn()
}))
}
}))
jest.mock('~/src/server/messaging/formAdapterEventPublisher.ts')
jest.mock('~/src/server/services/formsService.js')
Expand Down
4 changes: 1 addition & 3 deletions src/server/services/outputService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@ import {
type SubmitResponsePayload
} from '@defra/forms-model'

import { createLogger } from '~/src/server/common/helpers/logging/logger.js'
import { logger } from '~/src/server/common/helpers/logging/logger.js'
import { publishFormAdapterEvent } from '~/src/server/messaging/formAdapterEventPublisher.js'
import { getFormMetadataById } from '~/src/server/services/formsService.js'

const logger = createLogger()

/**
* Output service for handling form submission notifications
*/
Expand Down
Loading