fix: replace boot service with env variable

migtarx · Jul 29, 2024 · 63ba507 · 63ba507
1 parent 1bdc20d
commit 63ba507
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/.github/workflows/start.yml b/.github/workflows/start.yml
@@ -16,4 +16,4 @@ jobs:
     runs-on: [self-hosted, linux, x64, "${{ github.event.inputs.start_env }}"]
     steps:
       - name: ${{ github.event.inputs.start_env }} app start
-        run: PORT=${{ secrets.PORT }} STATUS_SERVER_IP=${{ secrets.STATUS_SERVER_IP }} FF_URL=${{ secrets.FF_URL }} FF_PASWD=${{ secrets.FF_PASWD }} pm2 start npm --name "BLOG" -- start --log-date-format 'DD-MM-YYYY HH:mm:ss'
+        run: ENV=${{ secrets.ENV }} PORT=${{ secrets.PORT }} STATUS_SERVER_IP=${{ secrets.STATUS_SERVER_IP }} FF_URL=${{ secrets.FF_URL }} FF_PASWD=${{ secrets.FF_PASWD }} pm2 start npm --name "BLOG" -- start --log-date-format 'DD-MM-YYYY HH:mm:ss'
diff --git a/src/app.js b/src/app.js
@@ -8,8 +8,6 @@ const helmet = require('helmet');
 const Falconflare = require('@mpuertadev/falconflare-client');
 const app = express();
 const { assignId, skipStatics, skipStatusServer } = require('./middlewares/morgan');
-const BootService = require('./services/boot.service');
-const execMode = BootService.getExecutionMode();
 const PORT = process.env.PORT || 3000; 
 
 app.use(express.json())
@@ -27,7 +25,7 @@ app.use(async function getLocation(req, res, next) {
   const ffclient = new Falconflare({serverUrl: process.env.FF_URL, accessKey: process.env.FF_PASSWD})
   let ipData;
   try {
-    const ip = global.exec_mode == "pro" ? req.headers['x-real-ip'] : req.ip;
+    const ip = process.env.ENV == "prod" ? req.headers['x-real-ip'] : req.ip;
     data = await ffclient.getIpData(ip);
   } catch (error) {
     console.error('Error fetching IP location:', error);

diff --git a/src/services/boot.service.js b/src/services/boot.service.js