tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

relays: add some ping/pong and connection logs

Browse Source 
need this for debugging connection issues

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-09-19 12:58:37 -07:00
parent 6254cea600
commit 2a61440aed
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
damus/Nostr/RelayConnection.swift
View File

@@ -46,9 +46,10 @@ final class RelayConnection: ObservableObject {
if err == nil { if err == nil {
self.last_pong = .now self.last_pong = .now
Log.info("Got pong from '%s'", for: .networking, self.relay_url.absoluteString)
self.log?.add("Successful ping") self.log?.add("Successful ping")
} else { } else {
print("pong failed, reconnecting \(self.relay_url.id)") Log.info("Ping failed, reconnecting to '%s'", for: .networking, self.relay_url.absoluteString)
self.isConnected = false self.isConnected = false
self.isConnecting = false self.isConnecting = false
self.reconnect_with_backoff() self.reconnect_with_backoff()
@@ -126,7 +127,7 @@ final class RelayConnection: ObservableObject {
self.receive(message: message) self.receive(message: message)
case .disconnected(let closeCode, let reason): case .disconnected(let closeCode, let reason):
if closeCode != .normalClosure { if closeCode != .normalClosure {
print("⚠️ Warning: RelayConnection (\(self.relay_url)) closed with code \(closeCode), reason: \(String(describing: reason))") Log.error("⚠️ Warning: RelayConnection (%d) closed with code: %s", for: .networking, String(describing: closeCode), String(describing: reason))
} }
DispatchQueue.main.async { DispatchQueue.main.async {
self.isConnected = false self.isConnected = false
@@ -134,7 +135,7 @@ final class RelayConnection: ObservableObject {
self.reconnect() self.reconnect()
} }
case .error(let error): case .error(let error):
print("⚠️ Warning: RelayConnection (\(self.relay_url)) error: \(error)") Log.error("⚠️ Warning: RelayConnection (%s) error: %s", for: .networking, self.relay_url.absoluteString, error.localizedDescription)
let nserr = error as NSError let nserr = error as NSError
if nserr.domain == NSPOSIXErrorDomain && nserr.code == 57 { if nserr.domain == NSPOSIXErrorDomain && nserr.code == 57 {
// ignore socket not connected? // ignore socket not connected?

1
damus/Nostr/RelayPool.swift
View File

@@ -89,6 +89,7 @@ class RelayPool {
} }
func ping() { func ping() {
Log.info("Pinging %d relays", for: .networking, relays.count)
for relay in relays { for relay in relays {
relay.connection.ping() relay.connection.ping()
} }

1
damus/Util/Log.swift
View File

@@ -13,6 +13,7 @@ enum LogCategory: String {
case nav case nav
case render case render
case storage case storage
case networking
case push_notifications case push_notifications
case damus_purple case damus_purple
case image_uploading case image_uploading