@opengis/fastify-table 1.1.41 → 1.1.42

package/index.js

@@ -59,7 +59,10 @@ async function plugin(fastify, opt) {
       request.log.fatal(request, { status: 501, error: error.toString() });
       return reply.status(500).send('ServerError');
     }
-    return reply.status(error.statusCode || 500).send(config.local ? error : 'ServerError');
+    // console.log(error);
+
+    request.log.error(error, request);
+    return reply.status(error.statusCode || 500).send(config.local ? error.toString() : 'ServerError');
   });
 
   // core migrations

package/logger/createFileStream.js

@@ -40,8 +40,11 @@ export default function () {
     source.on('data', (obj) => {
       if (['incoming request', 'request completed'].includes(obj.msg)) return;
       // console.log(obj)
-      const lvl = obj.msg?.file || obj.file || labels[obj.level];
+      const file = obj.msg?.logfolder || obj.logfolder;
+
+      const lvl = file || labels[obj.level];
       streams[lvl] = streams[lvl] || createFileStream({ level: lvl });
+
       streams[lvl].write(`${JSON.stringify(obj)}\n`);
     });
   }, {

package/logger/getLogger.js

@@ -10,7 +10,7 @@ import getHooks from './getHooks.js';
 import serializers from './serializers.js';
 
 const level = config.log?.level || process.env.PINO_LOG_LEVEL || 'info';
-
+console.log(`log level: ${level}`);
 const options = {
   level, // minimal log level to write
   timestamp: pino.stdTimeFunctions.isoTime, // timestamp as isostring
@@ -29,7 +29,7 @@ const options = {
   },
 };
 const logger = pino(options);
-logger.file = function userFile(file, msg, req) {
-  logger.info({ file, ...(typeof msg === 'string' ? { msg } : msg) }, req);
+logger.file = function userFile(logfolder, msg, req) {
+  logger.info({ logfolder, ...(typeof msg === 'string' ? { msg } : msg) }, req);
 };
 export default logger;

package/logger/serializers.js

@@ -1,24 +1,25 @@
 const serializers = {
-    req(request) {
-
-        const { method, url, referer, params, query, body, session } = request;
-        const { uid = undefined, user_name = undefined } = session?.passport?.user || {};
-        return {
-            method,
-            url,
-            referer,
-            ip: request.headers?.['x-real-ip']
+  req(request) {
+    const {
+      method, url, referer, params, query, body, session,
+    } = request;
+    const { uid = undefined, user_name = undefined } = session?.passport?.user || {};
+    return {
+      method,
+      url,
+      referer,
+      ip: request.headers?.['x-real-ip']
                 || request.headers?.['x-forwarded-for']
                 || request.ip
                 || request.connection?.remoteAddress,
-            uid,
-            dbName: request.pg?.options?.database,
-            user_name,
-            params,
-            query,
-            body,
-        };
-    }
+      uid,
+      dbName: request.pg?.options?.database,
+      user_name,
+      params,
+      query,
+      body,
+    };
+  },
 };
 
 export default serializers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengis/fastify-table",
-  "version": "1.1.41",
+  "version": "1.1.42",
   "type": "module",
   "description": "core-plugins",
   "main": "index.js",

package/pg/funcs/getPGAsync.js

@@ -6,11 +6,11 @@ import init from './init.js';
 async function getPGAsync(param) {
   const {
     user, password, host, port, db, database, name: origin, funcs,
-  } = typeof param === 'string'? { db:param } : param || {};
+  } = typeof param === 'string' ? { db: param } : param || {};
   if (funcs?.config) Object.assign(config, { ...funcs.config }); // unit test
   const name = origin || db || database || param || 'client';
-  
-  if (pgClients[name]) return pgClients[name];
+
+  if (pgClients[name]?.tlist) return pgClients[name];
 
   const dbConfig = {
     user: user || config.pg?.user,
@@ -21,9 +21,9 @@ async function getPGAsync(param) {
   };
 
   pgClients[name] = new pg.Pool(dbConfig);
-  
-  await init(pgClients[name]);  
-  
+
+  await init(pgClients[name]);
+
   return pgClients[name];
 }