diff --git a/archivebot-fix-queue-counters b/archivebot-fix-queue-counters index 6d16c06..e009d99 100755 --- a/archivebot-fix-queue-counters +++ b/archivebot-fix-queue-counters @@ -12,14 +12,14 @@ r = redis.StrictRedis.from_url(os.environ.get('REDIS_URL', 'redis://127.0.0.1:16 curDownloaded, curQueued = r.hmget(jobid, 'items_downloaded', 'items_queued') assert curDownloaded is not None and curQueued is not None, f'could not fetch downloaded and/or queued count for {jobid}' -print(f'Current control node values: {curDownloaded}/{curQueued}') +print(f'Current control node values: {curDownloaded}/{curQueued} (net {curQueued - curDownloaded})') db = sqlite3.connect('wpull.db') cur = db.cursor() res = cur.execute('SELECT (SELECT MAX(id) FROM queued_urls) AS total, (SELECT COUNT(id) AS i FROM queued_urls WHERE status = "todo") + (SELECT COUNT(id) AS i FROM queued_urls WHERE status = "error") + (SELECT COUNT(id) AS i FROM queued_urls WHERE status = "in_progress") AS queued') total, queued = res.fetchone() -print(f'Setting new values: {total - queued}/{total}') +print(f'Setting new values: {total - queued}/{total} (net {queued})') print(r.hmset(jobid, {'items_downloaded': total - queued, 'items_queued': total}))