diff --git a/packages/cache/src/bootstrap/cache.test.ts b/packages/cache/src/bootstrap/cache.test.ts index 99179bcd..25a18d99 100644 --- a/packages/cache/src/bootstrap/cache.test.ts +++ b/packages/cache/src/bootstrap/cache.test.ts @@ -273,8 +273,7 @@ describe('Cache API', () => { }) const cache = new NetlifyCache({ base64Encode, - getContext: () => ({ host, token, url }), - logger, + getContext: () => ({ host, logger, token, url }), name: 'my-cache', userAgent, }) diff --git a/packages/cache/src/bootstrap/cache.ts b/packages/cache/src/bootstrap/cache.ts index 7a36d59e..d572f490 100644 --- a/packages/cache/src/bootstrap/cache.ts +++ b/packages/cache/src/bootstrap/cache.ts @@ -26,14 +26,12 @@ const serializeResourceHeaders = Symbol('serializeResourceHeaders') export class NetlifyCache implements Cache { #base64Encode: Base64Encoder #getContext: RequestContextFactory - #logger?: Logger #name: string #userAgent?: string - constructor({ base64Encode, getContext, logger, name, userAgent }: NetlifyCacheOptions) { + constructor({ base64Encode, getContext, name, userAgent }: NetlifyCacheOptions) { this.#base64Encode = base64Encode this.#getContext = getContext - this.#logger = logger this.#name = name this.#userAgent = userAgent } @@ -185,7 +183,7 @@ export class NetlifyCache implements Cache { const errorDetail = cacheResponse.headers.get(HEADERS.ErrorDetail) ?? '' const errorMessage = ERROR_CODES[errorDetail as keyof typeof ERROR_CODES] || GENERIC_ERROR - this.#logger?.(`Failed to write to the cache: ${errorMessage}`) + context.logger?.(`Failed to write to the cache: ${errorMessage}`) } } } diff --git a/packages/cache/src/bootstrap/environment.ts b/packages/cache/src/bootstrap/environment.ts index fcbb94ca..bb368403 100644 --- a/packages/cache/src/bootstrap/environment.ts +++ b/packages/cache/src/bootstrap/environment.ts @@ -5,7 +5,6 @@ export type Logger = (...args: any[]) => void export interface EnvironmentOptions { base64Encode: Base64Encoder getContext: RequestContextFactory - logger?: Logger userAgent?: string } @@ -19,6 +18,7 @@ export type RequestContextFactory = (options: { operation: Operation }) => Reque export interface RequestContext { host: string + logger?: Logger token: string url: string }