From 0dca26429f5e01ed3201469328d4f6042ad9ce9d Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Tue, 23 Mar 2021 11:12:55 +0800
Subject: [PATCH] use Config.env instead of server.get('env')

---
 server.js | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/server.js b/server.js
index a9e43d2..64a7c10 100644
--- a/server.js
+++ b/server.js
@@ -23,7 +23,7 @@ const Config = require('so.sysconfig')({
 if (typeof Config.ssl === 'string') {
   Config.ssl = eval(`(${Config.ssl})`)
 }
-
+Config.env = process.env.NODE_ENV || 'development'
 ;(function serve() {
   console.log('★★★★★★★★ Starting Server ★★★★★★★★')
 
@@ -32,7 +32,7 @@ if (typeof Config.ssl === 'string') {
   const webtoken = require('so.webtoken')
 
   /*** 通用中间件 ***/
-  server.use(require('morgan')('development' === server.get('env') ? 'dev' : 'combined'))
+  server.use(require('morgan')('development' === Config.env ? 'dev' : 'combined'))
   server.use(require('body-parser').json())
   server.use(require('body-parser').urlencoded({ extended: false }))
   server.use(require('cookie-parser')())
@@ -104,9 +104,7 @@ if (typeof Config.ssl === 'string') {
         if (err) console.log(err)
         else
           console.log(
-            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttp} with IPv4=${ipv4} for ${
-              server.settings.env
-            } environment`
+            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttp} with IPv4=${ipv4} for ${Config.env} environment`
           )
       })
   } else if ('https' === Config.protocol) {
@@ -123,9 +121,7 @@ if (typeof Config.ssl === 'string') {
         if (err) console.log(err)
         else
           console.log(
-            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttps} with IPv4=${ipv4} for ${
-              server.settings.env
-            } environment`
+            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttps} with IPv4=${ipv4} for ${Config.env} environment`
           )
       })
   } else if ('httpall' === Config.protocol) {
@@ -141,7 +137,7 @@ if (typeof Config.ssl === 'string') {
         else
           console.log(
             `[${new Date().toJSON()}] Server redirecting from [${Config.protocol}] http://${Config.host}:${portHttp} with IPv4=${ipv4} for ${
-              server.settings.env
+              Config.env
             } environment`
           )
       })
@@ -159,7 +155,7 @@ if (typeof Config.ssl === 'string') {
         else
           console.log(
             `[${new Date().toJSON()}] Server listening on [${Config.protocol}] https://${Config.host}:${portHttps} with IPv4=${ipv4} for ${
-              server.settings.env
+              Config.env
             } environment`
           )
       })
@@ -174,9 +170,7 @@ if (typeof Config.ssl === 'string') {
         if (err) console.log(err)
         else
           console.log(
-            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttp} with IPv4=${ipv4} for ${
-              server.settings.env
-            } environment`
+            `[${new Date().toJSON()}] Server listening on ${Config.protocol}://${Config.host}:${portHttp} with IPv4=${ipv4} for ${Config.env} environment`
           )
       })
   }