re-introduce @blocklist-wrapper:main.isBlocklistFilterSetup fn

serverless-dns · Jan 24, 2022 · 15f5df6 · 15f5df6
1 parent c455420
commit 15f5df6
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/core/workers/config.js b/src/core/workers/config.js
@@ -25,7 +25,7 @@ function setup() {
     globalThis.envManager = new EnvManager();
   }
 
-  if (!globalThis.envManager) {
+  if (!globalThis.log) {
     globalThis.log = new Log(
       env.logLevel,
       isProd // set console level only in prod.

diff --git a/src/plugins/blocklist-wrapper/main.js b/src/plugins/blocklist-wrapper/main.js
@@ -34,7 +34,7 @@ class BlocklistWrapper {
   async RethinkModule(param) {
     let response = util.emptyResponse();
 
-    if (rdnsutil.isBlocklistFilterSetup(this.blocklistFilter)) {
+    if (this.isBlocklistFilterSetup()) {
       response.data.blocklistFilter = this.blocklistFilter;
       return response;
     }
@@ -67,7 +67,7 @@ class BlocklistWrapper {
         let totalWaitms = 0;
         const waitms = 50;
         while (totalWaitms < envutil.downloadTimeout()) {
-          if (rdnsutil.isBlocklistFilterSetup(this.blocklistFilter)) {
+          if (this.isBlocklistFilterSetup()) {
             response.data.blocklistFilter = this.blocklistFilter;
             return response;
           }
@@ -87,6 +87,10 @@ class BlocklistWrapper {
     return response;
   }
 
+  isBlocklistFilterSetup() {
+    return rdnsutil.isBlocklistFilterSetup(this.blocklistFilter);
+  }
+
   initBlocklistFilterConstruction(td, rd, ft, config) {
     this.isBlocklistUnderConstruction = true;
     this.startTime = Date.now();