improve control flow of daemon

sandwichfarm · Mar 17, 2024 · 26829df · 26829df
1 parent 7686d92
commit 26829df
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/apps/nocapd/src/classes/Worker.js b/apps/nocapd/src/classes/Worker.js
@@ -82,7 +82,7 @@ export class NWWorker {
       await this.addRelayJobs(relays)
     else 
       this.setTimeout( this.populator.bind(this), this.interval)
-    await this.$.worker.resume()
+    return async () => await this.$.worker.resume()
   }
 
   async work(job){
@@ -95,7 +95,6 @@ export class NWWorker {
       return { result } 
     } 
     catch(err) {
-      console.log(err)
       failure(new Error(`Failure inside work() block: ${err}`))
       return { result: { url: job.data.relay, open: { data: false }} }
     }

diff --git a/apps/nocapd/src/daemon.js b/apps/nocapd/src/daemon.js
@@ -23,25 +23,28 @@ let config
 let $q
 let intervalPopulate
 let intervalSyncRelays
+let intervalBugCheck
+let lastPopulate = 0
 
 const populateQueue = async () => { 
-  log.info(`drained: ${$q.queue.name}`)
-  await $q.checker.populator() 
+  const resume = await $q.checker.populator() 
   await delay(2000)
   await $q.checker.resetProgressCounts()
+  resume()
+  lastPopulate = Date.now()
 }
 
 const checkQueue = async () => {
   const counts = await $q.checker.counts()
   const enqueue = counts.prioritized + counts.active
   if(enqueue > 0) return 
   log.info(`drained: ${$q.queue.name}`)
-  await populateQueue()
+  populateQueue()
 }
 
 const setIntervals = () => {
   intervalSyncRelays = setInterval( syncRelaysIn, timestring(config?.nocapd?.seed?.options?.events?.interval, "ms") || timestring("1h", "ms"))
-  intervalPopulate = setInterval( checkQueue, timestring( "1m", "ms" ))
+  intervalPopulate = setInterval( checkQueue, timestring( config?.nocapd?.checks?.options?.interval, "ms" ))
 }
 
 const initWorker = async () => {