@platformatic/runtime 1.24.0 → 1.25.0

package/fixtures/configs/monorepo-hotreload.json

@@ -23,5 +23,10 @@
         "config": "platformatic.db.json"
       }
     }
+  },
+  "server": {
+    "logger": {
+      "level": "trace"
+    }
   }
 }

package/fixtures/management-api/platformatic.json

@@ -6,5 +6,9 @@
   "autoload": {
     "path": "./services"
   },
+  "server": {
+    "hostname": "127.0.0.1",
+    "port": 0
+  },
   "managementApi": true
 }

package/fixtures/management-api/services/service-1/platformatic.json

@@ -1,13 +1,5 @@
 {
   "$schema": "https://platformatic.dev/schemas/v1.22.0/service",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0,
-    "logger": {
-      "name": "service-with-logger",
-      "level": "trace"
-    }
-  },
   "service": {
     "openapi": true
   },

package/fixtures/management-api/services/service-2/platformatic.json

@@ -1,9 +1,5 @@
 {
   "$schema": "https://platformatic.dev/schemas/v1.22.0/service",
-  "server": {
-    "hostname": "127.0.0.1",
-    "port": 0
-  },
   "service": {
     "openapi": true
   },

package/lib/api.js

@@ -61,8 +61,6 @@ class RuntimeApi {
           if (this.#dispatcher) {
             await this.#dispatcher.close()
           }
-          await this.stopServices()
-
           setImmediate(process.exit) // Exit the worker thread.
           return
         }

package/lib/app.js

@@ -248,10 +248,12 @@ class PlatformaticApp {
   }
 
   #setuplogger (configManager) {
-    // Set the logger if not present
     configManager.current.server = configManager.current.server || {}
-    const childLogger = this.#logger.child({}, { level: configManager.current.server.logger?.level || 'info' })
-    configManager.current.server.logger = childLogger
+    const level = configManager.current.server.logger?.level
+
+    configManager.current.server.logger = level
+      ? this.#logger.child({ level })
+      : this.#logger
   }
 
   #startFileWatching () {

package/lib/management-api.js

@@ -4,21 +4,11 @@ const { tmpdir, platform } = require('node:os')
 const { join } = require('node:path')
 const { readFile, mkdir, unlink } = require('node:fs/promises')
 const fastify = require('fastify')
-const { prettyFactory } = require('pino-pretty')
 const errors = require('./errors')
 const platformaticVersion = require('../package.json').version
 
 const PLATFORMATIC_TMP_DIR = join(tmpdir(), 'platformatic', 'pids')
 
-const pinoLogLevels = {
-  fatal: 60,
-  error: 50,
-  warn: 40,
-  info: 30,
-  debug: 20,
-  trace: 10
-}
-
 async function createManagementApi (configManager, runtimeApiClient, loggingPort) {
   let apiConfig = configManager.current.managementApi
   if (!apiConfig || apiConfig === true) {
@@ -129,26 +119,9 @@ async function createManagementApi (configManager, runtimeApiClient, loggingPort
     })
 
     app.get('/logs', { websocket: true }, async (connection, req) => {
-      const logLevel = req.query.level || 'info'
-      const pretty = req.query.pretty !== 'false'
-      const serviceId = req.query.serviceId || null
-
-      const logLevelNumber = pinoLogLevels[logLevel]
-      const prettify = prettyFactory()
-
       const handler = (message) => {
-        for (let log of message.logs) {
-          try {
-            const parsedLog = JSON.parse(log)
-            if (parsedLog.level < logLevelNumber) continue
-            if (serviceId && parsedLog.name !== serviceId) continue
-            if (pretty) {
-              log = prettify(parsedLog)
-            }
-            connection.socket.send(log)
-          } catch (err) {
-            console.error('Failed to parse log message: ', log, err)
-          }
+        for (const log of message.logs) {
+          connection.socket.send(log)
         }
       }
 
@@ -163,7 +136,7 @@ async function createManagementApi (configManager, runtimeApiClient, loggingPort
         loggingPort.off('message', handler)
       })
     })
-  }, { prefix: '/api' })
+  }, { prefix: '/api/v1' })
 
   return app
 }

package/lib/worker.js

@@ -34,14 +34,7 @@ globalThis.fetch = undici.fetch
 
 const config = workerData.config
 
-let loggerConfig = config.server?.logger
-
-if (loggerConfig) {
-  loggerConfig = { ...loggerConfig }
-} else {
-  loggerConfig = {}
-}
-
+const loggerConfig = { ...config.server?.logger }
 const cliStream = isatty(1) ? pretty() : pino.destination(1)
 
 let logger = null
@@ -54,6 +47,10 @@ if (config.loggingPort) {
     { stream: portStream, level: 'trace' },
     { stream: cliStream, level: loggerConfig.level || 'info' }
   ])
+  if (loggerConfig.transport) {
+    const transport = pino.transport(loggerConfig.transport)
+    multiStream.add({ level: loggerConfig.level || 'info', stream: transport })
+  }
   logger = pino({ level: 'trace' }, multiStream)
 } else {
   logger = pino(loggerConfig, cliStream)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/runtime",
-  "version": "1.24.0",
+  "version": "1.25.0",
   "description": "",
   "main": "index.js",
   "bin": {
@@ -32,8 +32,8 @@
     "typescript": "^5.3.3",
     "undici-oauth-interceptor": "^0.4.2",
     "ws": "^8.16.0",
-    "@platformatic/sql-graphql": "1.24.0",
-    "@platformatic/sql-mapper": "1.24.0"
+    "@platformatic/sql-mapper": "1.25.0",
+    "@platformatic/sql-graphql": "1.25.0"
   },
   "dependencies": {
     "@fastify/error": "^3.4.1",
@@ -55,13 +55,13 @@
     "pino-pretty": "^10.3.1",
     "undici": "^6.6.0",
     "why-is-node-running": "^2.2.2",
-    "@platformatic/composer": "1.24.0",
-    "@platformatic/config": "1.24.0",
-    "@platformatic/db": "1.24.0",
-    "@platformatic/generators": "1.24.0",
-    "@platformatic/service": "1.24.0",
-    "@platformatic/telemetry": "1.24.0",
-    "@platformatic/utils": "1.24.0"
+    "@platformatic/composer": "1.25.0",
+    "@platformatic/config": "1.25.0",
+    "@platformatic/generators": "1.25.0",
+    "@platformatic/service": "1.25.0",
+    "@platformatic/telemetry": "1.25.0",
+    "@platformatic/db": "1.25.0",
+    "@platformatic/utils": "1.25.0"
   },
   "standard": {
     "ignore": [