goodmorningbitcoin/wot-relay
1
0
Fork 0
mirror of https://github.com/bitvora/wot-relay.git synced 2025-06-06 18:31:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent archiving from getting stuck

Browse Source
This commit is contained in:
Barry Deen 2024-09-11 12:55:40 -04:00
parent 489e51e274
commit f1ff8bb6bb
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
main.go
View File

@ -147,7 +147,7 @@ func LoadConfig() Config {
godotenv.Load(".env") godotenv.Load(".env")
if os.Getenv("REFRESH_INTERVAL_HOURS") == "" { if os.Getenv("REFRESH_INTERVAL_HOURS") == "" {
os.Setenv("REFRESH_INTERVAL_HOURS", "24") os.Setenv("REFRESH_INTERVAL_HOURS", "3")
} }
refreshInterval, _ := strconv.Atoi(os.Getenv("REFRESH_INTERVAL_HOURS")) refreshInterval, _ := strconv.Atoi(os.Getenv("REFRESH_INTERVAL_HOURS"))
@ -193,7 +193,7 @@ func updateTrustNetworkFilter() {
func refreshTrustNetwork(relay *khatru.Relay, ctx context.Context) { func refreshTrustNetwork(relay *khatru.Relay, ctx context.Context) {
runTrustNetworkRefresh := func() { runTrustNetworkRefresh := func() {
timeoutCtx, cancel := context.WithTimeout(ctx, 1*time.Second) timeoutCtx, cancel := context.WithTimeout(ctx, 3*time.Second)
defer cancel() defer cancel()
filters := []nostr.Filter{{ filters := []nostr.Filter{{
@ -210,7 +210,7 @@ func refreshTrustNetwork(relay *khatru.Relay, ctx context.Context) {
log.Println("🌐 building web of trust graph") log.Println("🌐 building web of trust graph")
for i := 0; i < len(oneHopNetwork); i += 100 { for i := 0; i < len(oneHopNetwork); i += 100 {
timeout, cancel := context.WithTimeout(ctx, 3*time.Second) timeout, cancel := context.WithTimeout(ctx, 4*time.Second)
defer cancel() defer cancel()
end := i + 100 end := i + 100
@ -321,19 +321,27 @@ func archiveTrustedNotes(relay *khatru.Relay, ctx context.Context) {
var trustedNotes uint64 var trustedNotes uint64
var untrustedNotes uint64 var untrustedNotes uint64
trustNetworkFilterMu.Lock() trustNetworkFilterMu.Lock()
for ev := range pool.SubMany(timeout, seedRelays, filters) { defer trustNetworkFilterMu.Unlock()
for ev := range pool.SubManyEose(timeout, seedRelays, filters) {
select {
case <-ctx.Done():
log.Println("⏰ Archive process terminated due to timeout")
return
default:
if trustNetworkFilter.Has(xxhash.Sum64([]byte(ev.Event.PubKey))) { if trustNetworkFilter.Has(xxhash.Sum64([]byte(ev.Event.PubKey))) {
if len(ev.Event.Tags) > 2000 { if len(ev.Event.Tags) > 3000 {
continue continue
} }
relay.AddEvent(ctx, ev.Event) relay.AddEvent(ctx, ev.Event)
log.Println("📦 archived note from", ev.Event.PubKey) log.Println("📦 archived note: ", ev.Event.ID)
trustedNotes++ trustedNotes++
} else { } else {
untrustedNotes++ untrustedNotes++
} }
} }
trustNetworkFilterMu.Unlock() }
log.Println("📦 archived", trustedNotes, "trusted notes and discarded", untrustedNotes, "untrusted notes") log.Println("📦 archived", trustedNotes, "trusted notes and discarded", untrustedNotes, "untrusted notes")
} }