@canmingir/link-express 1.6.9 → 1.6.11

package/.github/workflows/publish.yml

@@ -46,7 +46,6 @@ jobs:
         id: version_bump
         run: |
           npm version ${{ github.event.inputs.version_type }} -m "Bump version to %s [skip ci]"
-          echo "new_version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
           git push --follow-tags
       
       - name: Publish to NPM
@@ -54,11 +53,4 @@ jobs:
         run: npm publish --access public
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-      
-      - name: Revert version bump on failure
-        if: failure() && steps.version_bump.outcome == 'success'
-        run: |
-          git reset --hard HEAD~1
-          git tag -d v${{ steps.version_bump.outputs.new_version }}
-          git push --force
-          git push --delete origin v${{ steps.version_bump.outputs.new_version }}
+      

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canmingir/link-express",
-  "version": "1.6.9",
+  "version": "1.6.11",
   "description": "",
   "main": "index.js",
   "author": "NucTeam",
@@ -21,6 +21,7 @@
   "dependencies": {
     "@aws-sdk/client-dynamodb": "^3.614.0",
     "@aws-sdk/lib-dynamodb": "^3.614.0",
+    "@elastic/ecs-pino-format": "^1.5.0",
     "axios": "^1.7.2",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
@@ -33,6 +34,8 @@
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
     "pg": "^8.12.0",
+    "pino": "^10.1.0",
+    "pino-elasticsearch": "^8.1.0",
     "prom-client": "^15.1.3",
     "sequelize": "^6.37.3",
     "swagger-jsdoc": "^6.2.8",

package/src/logger.js

@@ -0,0 +1,34 @@
+const { ecsFormat } = require("@elastic/ecs-pino-format");
+const pino = require("pino");
+const pinoElastic = require("pino-elasticsearch");
+
+const config = require("./config");
+
+const { logger: loggerConfig, project } = config();
+
+const streams = [{ stream: process.stdout }];
+
+const streamToElastic = pinoElastic({
+  index: loggerConfig.elasticsearch.index,
+  consistency: loggerConfig.elasticsearch.consistency || "one",
+  node: loggerConfig.elasticsearch.node,
+  esVersion: loggerConfig.elasticsearch.esVersion || 8,
+  flushBytes: loggerConfig.elasticsearch.flushBytes || 1000,
+});
+
+streams.push({ stream: streamToElastic });
+
+const logger = pino(
+  {
+    ...ecsFormat(),
+    base: {
+      service: {
+        name: project.name,
+        version: project.version,
+      },
+    },
+  },
+  pino.multistream(streams)
+);
+
+module.exports = logger;

package/src/metrics/dbMetrics.js

@@ -48,7 +48,7 @@ class DBMetrics {
       url: metrics.url || "http://localhost:9091",
       jobName: metrics.pushGateway.jobName || "api",
       instance: metrics.pushGateway.instance || "database",
-      interval: config.interval || 15000,
+      interval: metrics.interval || 15000,
     };
 
     this.stopPushgateway();

package/src/platform.js

@@ -5,6 +5,7 @@ const error = require("./error");
 let _express;
 let _postgres;
 let _dynamodb;
+let _logger;
 
 function init(config = {}) {
   return new Promise((resolve, reject) => {
@@ -13,10 +14,16 @@ function init(config = {}) {
         module.exports = fs.readFileSync(filename, "utf8").trim();
       };
 
-      const { postgres, dynamodb } = require("./config").init(config);
+      const { postgres, dynamodb, logger } = require("./config").init(config);
 
       _express = require("./express");
 
+      if (logger) {
+        _logger = require("./logger");
+      } else {
+        _logger = console;
+      }
+
       if (postgres) {
         _postgres = require("./postgres");
       }
@@ -43,4 +50,7 @@ module.exports = {
   require: (pkg) => require(pkg),
   authorization,
   error,
+  get logger() {
+    return _logger;
+  },
 };