@platformatic/basic 2.62.1 → 2.63.1

package/lib/base.js

@@ -41,6 +41,7 @@ export class BaseStackable {
     this.metricsRegistry = new client.Registry()
     this.#metricsCollected = false
     this.customHealthCheck = null
+    this.customReadinessCheck = null
     this.startHttpTimer = null
     this.endHttpTimer = null
     this.clientWs = null
@@ -48,7 +49,8 @@ export class BaseStackable {
     this.stdout = standardStreams?.stdout ?? process.stdout
     this.stderr = standardStreams?.stderr ?? process.stderr
 
-    const pinoOptions = buildPinoOptions(this.configManager.current?.logger, this.serverConfig?.logger, this.serviceId, this.workerId, options, this.root)
+    const loggerOptions = deepmerge(this.runtimeConfig?.logger ?? {}, this.configManager.current?.logger ?? {})
+    const pinoOptions = buildPinoOptions(loggerOptions, this.serverConfig?.logger, this.serviceId, this.workerId, options, this.root)
     this.logger = pino(pinoOptions, standardStreams?.stdout)
 
     // Setup globals
@@ -66,6 +68,8 @@ export class BaseStackable {
       invalidateHttpCache: this.#invalidateHttpCache.bind(this),
       prometheus: { client, registry: this.metricsRegistry },
       setCustomHealthCheck: this.setCustomHealthCheck.bind(this),
+      setCustomReadinessCheck: this.setCustomReadinessCheck.bind(this),
+      logger: this.logger
     })
   }
 
@@ -130,6 +134,10 @@ export class BaseStackable {
     this.customHealthCheck = fn
   }
 
+  setCustomReadinessCheck (fn) {
+    this.customReadinessCheck = fn
+  }
+
   async getCustomHealthCheck () {
     if (!this.customHealthCheck) {
       return true
@@ -137,6 +145,13 @@ export class BaseStackable {
     return await this.customHealthCheck()
   }
 
+  async getCustomReadinessCheck () {
+    if (!this.customReadinessCheck) {
+      return true
+    }
+    return await this.customReadinessCheck()
+  }
+
   setConnectionString (connectionString) {
     this.connectionString = connectionString
   }
@@ -152,7 +167,6 @@ export class BaseStackable {
 
   registerGlobals (globals) {
     globalThis.platformatic = Object.assign(globalThis.platformatic ?? {}, globals)
-    globalThis.platformatic.logger = this.logger
   }
 
   verifyOutputDirectory (path) {

package/lib/worker/child-process.js

@@ -1,6 +1,6 @@
 import { ITC } from '@platformatic/itc'
 import { client, collectMetrics } from '@platformatic/metrics'
-import { disablePinoDirectWrite, ensureFlushedWorkerStdio, ensureLoggableError, features } from '@platformatic/utils'
+import { buildPinoFormatters, buildPinoTimestamp, disablePinoDirectWrite, ensureFlushedWorkerStdio, ensureLoggableError, features } from '@platformatic/utils'
 import diagnosticChannel, { tracingChannel } from 'node:diagnostics_channel'
 import { EventEmitter, once } from 'node:events'
 import { readFile } from 'node:fs/promises'
@@ -100,6 +100,7 @@ export class ChildProcess extends ITC {
     })
 
     this.registerGlobals({
+      logger: this.#logger,
       setOpenapiSchema: this.setOpenapiSchema.bind(this),
       setGraphqlSchema: this.setGraphqlSchema.bind(this),
       setConnectionString: this.setConnectionString.bind(this),
@@ -198,10 +199,18 @@ export class ChildProcess extends ITC {
 
     // Since this is executed by user code, make sure we only override this in the main thread
     // The rest will be intercepted by the BaseStackable.
+    const loggerOptions = globalThis.platformatic?.config?.logger ?? {}
     const pinoOptions = {
-      level: 'info',
+      ...loggerOptions,
+      level: loggerOptions.level ?? 'info',
       name: globalThis.platformatic.serviceId
     }
+    if (loggerOptions.formatters) {
+      pinoOptions.formatters = buildPinoFormatters(loggerOptions.formatters)
+    }
+    if (loggerOptions.timestamp) {
+      pinoOptions.timestamp = buildPinoTimestamp(loggerOptions.timestamp)
+    }
 
     if (typeof globalThis.platformatic.workerId !== 'undefined') {
       pinoOptions.base = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/basic",
-  "version": "2.62.1",
+  "version": "2.63.1",
   "description": "",
   "main": "index.js",
   "type": "module",
@@ -24,14 +24,14 @@
     "split2": "^4.2.0",
     "undici": "^7.0.0",
     "ws": "^8.18.0",
-    "@platformatic/config": "2.62.1",
-    "@platformatic/itc": "2.62.1",
-    "@platformatic/metrics": "2.62.1",
-    "@platformatic/telemetry": "2.62.1",
-    "@platformatic/utils": "2.62.1"
+    "@platformatic/config": "2.63.1",
+    "@platformatic/metrics": "2.63.1",
+    "@platformatic/itc": "2.63.1",
+    "@platformatic/telemetry": "2.63.1",
+    "@platformatic/utils": "2.63.1"
   },
   "devDependencies": {
-    "borp": "^0.19.0",
+    "borp": "^0.20.0",
     "eslint": "9",
     "express": "^4.19.2",
     "fastify": "^5.0.0",

package/schema.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.62.1.json",
+  "$id": "https://schemas.platformatic.dev/@platformatic/basic/2.63.1.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "Platformatic Stackable",
   "type": "object",