Merge branch '1.2'

2019-01-19 11:19:41 +01:00
parent 8bfc0dad14 624f7046af
commit 494d0404ed
1 changed files with 26 additions and 13 deletions
@@ -33,20 +33,33 @@ if (config.trustedProxy != null) {

    console.log("Trusting proxy", config.trustedProxy);
  } else {
-    dns.resolve4(config.trustedProxy, (err, res) => {
-      if (err != null) {
-        console.error("Failed to resolve trustedProxy hostname")
-        console.error(err)
-        process.exit(1)
-      }
-      if (res.length === 0) {
-        console.error("No results for trustedProxy hostname")
-        process.exit(1)
-      }
+    let trusted = null

-      console.log("Trusting proxy", res[0], `(${config.trustedProxy})`);
-      app.set('trust proxy', res[0])
-    })
+    setInterval(() => {
+      dns.resolve4(config.trustedProxy, (err, res) => {
+        if (err != null) {
+          if (trusted === null) {
+            console.error("Failed to resolve trustedProxy hostname")
+          }
+          
+          return
+        }
+        if (res.length === 0) {
+          if (trusted === null) {
+            console.error("No results for trustedProxy hostname")
+          }
+          
+          return
+        }
+  
+        if (trusted !== res[0]) {
+          console.log("Trusting proxy", res[0], `(${config.trustedProxy})`);
+          app.set('trust proxy', res[0])
+        
+          trusted = res[0]
+        }
+      })
+    }, 1000)
  }
 }