cleanup and fixes to worker

sandwichfarm · Sep 17, 2024 · ba0a112 · ba0a112
1 parent 722f2c9
commit ba0a112
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 103 deletions.
diff --git a/apps/nocapd/src/classes/Worker.js b/apps/nocapd/src/classes/Worker.js
@@ -549,10 +549,11 @@ export class NWWorker {
       cacheMessage += `online & expired: ${this.cache_counts.onlineExpired}  -  `
       cacheMessage += `expired: ${this.cache_counts.expired}  -  `
       cacheMessage += `unchecked: ${this.cache_counts.unchecked}  -  `
-      cacheMessage += `total: ${this.cache_counts.allRelays}  `
-      cacheMessage += `|  ignored: ${this.cache_counts.ignoredRelays} -  `
-      cacheMessage += `with parents: ${this.cache_counts.relaysWithParents} -  `
-      cacheMessage += `parents: ${this.cache_counts.relaysAreParents} ===`
+      cacheMessage += `total: ${this.cache_counts.allRelays}  |   `
+      cacheMessage += `ignored: ${this.cache_counts.ignoredRelays} -  `
+      cacheMessage += `parents: ${this.cache_counts.relaysAreParents} -  `
+      cacheMessage += `children: ${this.cache_counts.relaysWithParents} ===`
+
 
       this.log.info(chalk.blue.bold(cacheMessage));
     })

diff --git a/apps/nocapd/src/daemon.js b/apps/nocapd/src/daemon.js
@@ -31,8 +31,8 @@ const populateJobQueue = async () => {
   const activeJobs = (await $q.checker.getActiveJobs()).map( j => j.id )
   if(activeJobs.length > 0)
     log.warn(`active jobs: ${activeJobs}`)
-  await $q.checker.populator() 
-  await $q.checker.resetProgressCounts()
+  await $q.checker.populator().catch(log.error)
+  await $q.checker.resetProgressCounts().catch(log.error)
 }
 
 const maybePopulateJobs = async (queue) => {
@@ -184,7 +184,7 @@ const scheduleRelayPopulator = () =>{
 
   const job = async () => {
     log.debug(`Scheduled: populateRelays()`)
-    await populateRelays() 
+    await populateRelays().catch(log.error)
   }
   return scheduleSeconds(name, seconds, job)
 }

diff --git a/internal/kinds/30111/README.md b/internal/kinds/30111/README.md