chore: cleanup debug logging

Author: Bilb

ts/session/revocation_list/pro_revocation_list.ts

@@ -24,15 +24,12 @@ async function loadFromDbIfNeeded() {
 
   const resetItems: ProRevocationItemsDBType = [];
   if (!isString(itemsFromDb) || !itemsFromDb) {
-    // reset the cache and the DB entry manually (not calling setListItems here)
-    await Storage.put(SettingsKey.proRevocationListItems, JSON.stringify(resetItems));
-    cachedProRevocationListItems = resetItems;
+    await setListItems(resetItems, false);
   } else {
     try {
       const parsedJsonItems = JSON.parse(itemsFromDb);
       if (!isArray(parsedJsonItems)) {
-        await Storage.put(SettingsKey.proRevocationListItems, JSON.stringify(resetItems));
-        cachedProRevocationListItems = resetItems;
+        await setListItems(resetItems, false);
       } else {
         const parsed = ProRevocationItemsDBSchema.safeParse(parsedJsonItems);
 
@@ -43,17 +40,15 @@ async function loadFromDbIfNeeded() {
             'failed to parse pro revocation list items from storage, resetting to []. error:',
             parsed.error
           );
-          await Storage.put(SettingsKey.proRevocationListItems, JSON.stringify(resetItems));
-          cachedProRevocationListItems = resetItems;
+          await setListItems(resetItems, false);
         }
       }
     } catch (e) {
       window.log.warn(
         'failed to parse pro revocation list items from storage, resetting to []. error:',
         e.message
       );
-      await Storage.put(SettingsKey.proRevocationListItems, JSON.stringify(resetItems));
-      cachedProRevocationListItems = resetItems;
+      await setListItems(resetItems, false);
     }
   }
 
@@ -85,8 +80,10 @@ async function getListItems(): Promise<ProRevocationItemsDBType> {
   return cachedProRevocationListItems;
 }
 
-async function setListItems(items: ProRevocationItemsDBType) {
-  assertInitialFetchFromDBDone('setListItems');
+async function setListItems(items: ProRevocationItemsDBType, assertLoaded = true) {
+  if (assertLoaded) {
+    assertInitialFetchFromDBDone('setListItems');
+  }
 
   await Storage.put(SettingsKey.proRevocationListItems, JSON.stringify(items));
   cachedProRevocationListItems = items;

ts/session/utils/job_runners/jobs/UpdateProRevocationListJob.ts

@@ -101,10 +101,11 @@ class UpdateProRevocationListJob extends PersistedJob<UpdateProRevocationListPer
 
       const retryInSecondsFromBackend = response.result.retry_in_s;
       const retryInSeconds = Math.max(retryInSecondsFromBackend, 0);
+
       const retryAtMs = Date.now() + toNumber(retryInSeconds) * DURATION.SECONDS;
 
       window.log.debug(
-        `UpdateProRevocationListJob: got 'retry_in_s' from server: ${retryInSeconds}, i.e retryAtMs: ${retryAtMs}`
+        `UpdateProRevocationListJob: got 'retry_in_s' from server: ${retryInSeconds}, i.e we will retryAtMs: ${retryAtMs}`
       );
       await updateNextRunAtMs(retryAtMs);
 
@@ -208,11 +209,14 @@ async function queueNewJobIfNeeded() {
     );
     return;
   }
+  const postponedSeconds = 20;
   window.log.debug(
-    `Scheduling UpdateProRevocationListJob.... refreshedNextRunAtMs: ${refreshedNextRunAtMs} and now: ${now}`
+    `Scheduling UpdateProRevocationListJob in ${postponedSeconds}s. refreshedNextRunAtMs: ${refreshedNextRunAtMs} and now: ${now}`
   );
   await runners.updateProRevocationListRunner.addJob(
-    new UpdateProRevocationListJob({ nextAttemptTimestamp: Date.now() + 20 * DURATION.SECONDS })
+    new UpdateProRevocationListJob({
+      nextAttemptTimestamp: Date.now() + postponedSeconds * DURATION.SECONDS,
+    })
   );
 }