nostr/strfry
1
0
Fork 0
mirror of https://github.com/hoytech/strfry.git synced 2025-06-19 17:37:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor cron

Browse Source
This commit is contained in:
Doug Hoyte
2023-02-19 01:24:31 -05:00
parent 524118c7a5
commit d5cb732cd4
3 changed files with 84 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/RelayCron.cpp
View File

@ -1,9 +1,21 @@
#include <hoytech/timer.h>
#include "RelayServer.h" #include "RelayServer.h"
#include "gc.h" #include "gc.h"
void RelayServer::cleanupOldEvents() { void RelayServer::runCron() {
auto qdb = getQdbInstance();
hoytech::timer cron;
cron.setupCb = []{ setThreadName("cron"); };
// Delete ephemeral events
cron.repeat(10 * 1'000'000UL, [&]{
std::vector<uint64_t> expiredLevIds; std::vector<uint64_t> expiredLevIds;
{ {
@ -42,8 +54,6 @@ void RelayServer::cleanupOldEvents() {
} }
if (expiredLevIds.size() > 0) { if (expiredLevIds.size() > 0) {
auto qdb = getQdbInstance();
auto txn = env.txn_rw(); auto txn = env.txn_rw();
uint64_t numDeleted = 0; uint64_t numDeleted = 0;
@ -62,10 +72,15 @@ void RelayServer::cleanupOldEvents() {
if (numDeleted) LI << "Deleted " << numDeleted << " ephemeral events"; if (numDeleted) LI << "Deleted " << numDeleted << " ephemeral events";
} }
} });
void RelayServer::garbageCollect() { // Garbage collect quadrable nodes
auto qdb = getQdbInstance();
cron.repeat(60 * 60 * 1'000'000UL, [&]{
quadrableGarbageCollect(qdb, 1); quadrableGarbageCollect(qdb, 1);
});
cron.run();
while (1) std::this_thread::sleep_for(std::chrono::seconds(1'000'000));
} }

6
src/RelayServer.h
View File

@ -4,7 +4,6 @@
#include <memory> #include <memory>
#include <algorithm> #include <algorithm>
#include <hoytech/timer.h>
#include <hoytech/time.h> #include <hoytech/time.h>
#include <hoytech/hex.h> #include <hoytech/hex.h>
#include <hoytech/file_change_monitor.h> #include <hoytech/file_change_monitor.h>
@ -142,7 +141,7 @@ struct RelayServer {
ThreadPool<MsgReqWorker> tpReqWorker; ThreadPool<MsgReqWorker> tpReqWorker;
ThreadPool<MsgReqMonitor> tpReqMonitor; ThreadPool<MsgReqMonitor> tpReqMonitor;
ThreadPool<MsgYesstr> tpYesstr; ThreadPool<MsgYesstr> tpYesstr;
hoytech::timer cron; std::thread cronThread;
void run(); void run();
@ -161,8 +160,7 @@ struct RelayServer {
void runYesstr(ThreadPool<MsgYesstr>::Thread &thr); void runYesstr(ThreadPool<MsgYesstr>::Thread &thr);
void cleanupOldEvents(); void runCron();
void garbageCollect();
// Utils (can be called by any thread) // Utils (can be called by any thread)

17
src/cmd_relay.cpp
View File

@ -32,6 +32,10 @@ void RelayServer::run() {
runYesstr(thr); runYesstr(thr);
}); });
cronThread = std::thread([this]{
runCron();
});
// Monitor for config file reloads // Monitor for config file reloads
auto configFileChangeWatcher = hoytech::file_change_monitor(configFile); auto configFileChangeWatcher = hoytech::file_change_monitor(configFile);
@ -42,19 +46,6 @@ void RelayServer::run() {
loadConfig(configFile); loadConfig(configFile);
}); });
// Cron
cron.repeat(10 * 1'000'000UL, [&]{
cleanupOldEvents();
});
cron.repeat(60 * 60 * 1'000'000UL, [&]{
garbageCollect();
});
cron.setupCb = []{ setThreadName("cron"); };
cron.run();
tpWebsocket.join(); tpWebsocket.join();
} }