chore: make log topics consistent with nim-chronicles style

waku/v2/node/jsonrpc/admin_api.nim

@@ -17,7 +17,7 @@ import
 export jsonrpc_types
 
 logScope:
-  topics = "admin api"
+  topics = "waku node jsonrpc admin_api"
 
 const futTimeout* = 30.seconds # Max time to wait for futures
 

waku/v2/node/jsonrpc/debug_api.nim

@@ -6,7 +6,7 @@ import
   ../waku_node
 
 logScope:
-  topics = "debug api"
+  topics = "waku node jsonrpc debug_api"
 
 proc installDebugApiHandlers*(node: WakuNode, rpcsrv: RpcServer) =
 

waku/v2/node/jsonrpc/filter_api.nim

@@ -14,7 +14,7 @@ import
 export jsonrpc_types
 
 logScope:
-  topics = "wakunode.rpc.filter"
+  topics = "waku node jsonrpc filter_api"
 
 
 const DefaultPubsubTopic: PubsubTopic = "/waku/2/default-waku/proto"

waku/v2/node/jsonrpc/private_api.nim

@@ -14,7 +14,7 @@ import
 export waku_payload, jsonrpc_types
 
 logScope:
-  topics = "private api"
+  topics = "waku node jsonrpc private_api"
 
 const futTimeout* = 5.seconds # Max time to wait for futures
 

waku/v2/node/jsonrpc/relay_api.nim

@@ -13,7 +13,7 @@ import
 export jsonrpc_types
 
 logScope:
-  topics = "relay api"
+  topics = "waku node jsonrpc relay_api"
 
 const futTimeout* = 5.seconds # Max time to wait for futures
 const maxCache* = 30 # Max number of messages cached per topic @TODO make this configurable

waku/v2/node/jsonrpc/store_api.nim

@@ -15,7 +15,7 @@ import
 export jsonrpc_types
 
 logScope:
-  topics = "store api"
+  topics = "waku node jsonrpc store_api"
 
 proc installStoreApiHandlers*(node: WakuNode, rpcsrv: RpcServer) =
   const futTimeout = 5.seconds

waku/v2/node/message_cache.nim

@@ -9,7 +9,8 @@ import
 import
   ../protocol/waku_message
 
-logScope: topics = "message_cache"
+logScope: 
+  topics = "waku node message_cache"
 
 const DefaultMessageCacheCapacity*: uint = 30 # Max number of messages cached per topic @TODO make this configurable
 

waku/v2/node/peer_manager/peer_manager.nim

@@ -15,7 +15,7 @@ declarePublicCounter waku_node_conns_initiated, "Number of connections initiated
 declarePublicGauge waku_peers_errors, "Number of peer manager errors", ["type"]
 
 logScope:
-  topics = "wakupeers"
+  topics = "waku node peer_manager"
 
 type
   PeerManager* = ref object of RootObj
@@ -130,15 +130,13 @@ proc new*(T: type PeerManager, switch: Switch, storage: PeerStorage = nil): Peer
                        peerStore: WakuPeerStore.new(),
                        storage: storage)
   
-  debug "creating new PeerManager"
-
   proc peerHook(peerId: PeerID, event: ConnEvent): Future[void] {.gcsafe.} =
     onConnEvent(pm, peerId, event)
   
   pm.switch.addConnEventHandler(peerHook, ConnEventKind.Connected)
   pm.switch.addConnEventHandler(peerHook, ConnEventKind.Disconnected)
 
-  if not storage.isNil:
+  if not storage.isNil():
     debug "found persistent peer storage"
     pm.loadFromStorage() # Load previously managed peers.
   else:

waku/v2/node/rest/debug/debug_api.nim

@@ -10,7 +10,8 @@ import "."/api_types
 import ".."/[serdes, utils]
 import ../../waku_node
 
-logScope: topics = "rest_api_debug"
+logScope:
+  topics = "waku node rest debug_api"
 
 
 ####  Server request handlers

waku/v2/node/rest/relay/relay_api.nim

@@ -14,7 +14,8 @@ import
   ./api_types, 
   ./topic_cache
 
-logScope: topics = "rest_api_relay"
+logScope: 
+  topics = "waku node rest relay_api"
 
 
 ##### Topic cache

waku/v2/node/rest/relay/topic_cache.nim

@@ -9,7 +9,8 @@ import
   ../../../protocol/waku_message,
   ../../message_cache
 
-logScope: topics = "rest_api_relay_topiccache"
+logScope: 
+  topics = "waku node rest relay_api"
 
 export message_cache
 

waku/v2/node/rest/serdes.nim

@@ -9,7 +9,8 @@ import
   json_serialization/std/[options, net, sets],
   presto/common
 
-logScope: topics = "rest_api_serdes"
+logScope: 
+  topics = "waku node rest"
 
 Json.createFlavor RestJson
 

waku/v2/node/storage/message/message_retention_policy_capacity.nim

@@ -8,7 +8,7 @@ import
   ./message_retention_policy
 
 logScope:
-  topics = "message_store.sqlite_store.retention_policy.capacity"
+  topics = "waku node message_store retention_policy"
 
 
 const StoreDefaultCapacity*: int = 25_000

waku/v2/node/storage/message/message_retention_policy_time.nim

@@ -11,7 +11,7 @@ import
   ./message_retention_policy
 
 logScope:
-  topics = "message_store.sqlite_store.retention_policy.time"
+  topics = "waku node message_store retention_policy"
 
 
 const StoreDefaultRetentionTime*: int64 = 30.days.seconds

waku/v2/node/storage/message/queue_store/queue_store.nim

@@ -14,7 +14,7 @@ import
 
 
 logScope:
-  topics = "message_store.storequeue"
+  topics = "waku node message_store storequeue"
 
 
 const StoreQueueDefaultMaxCapacity* = 25_000

waku/v2/node/storage/message/sqlite_store/sqlite_store.nim

@@ -15,7 +15,7 @@ import
   ./queries
 
 logScope:
-  topics = "message_store.sqlite"
+  topics = "waku node message_store sqlite"
 
 
 proc init(db: SqliteDatabase): MessageStoreResult[void] =

waku/v2/node/waku_metrics.nim

@@ -22,7 +22,7 @@ when defined(rln) or defined(rlnzerokit):
 const LogInterval = 30.seconds
 
 logScope:
-  topics = "waku.metrics"
+  topics = "waku node metrics"
 
 
 proc startMetricsServer*(serverIp: ValidIpAddress, serverPort: Port) =

waku/v2/protocol/waku_filter/client.nim

@@ -19,7 +19,7 @@ import
 
 
 logScope:
-  topics = "wakufilter.client"
+  topics = "waku filter client"
 
 
 const Defaultstring = "/waku/2/default-waku/proto"

waku/v2/protocol/waku_lightpush/client.nim

@@ -18,7 +18,7 @@ import
 
 
 logScope:
-  topics = "wakulightpush.client"
+  topics = "waku lightpush client"
 
 
 type WakuLightPushClient* = ref object

waku/v2/protocol/waku_peer_exchange/protocol.nim

@@ -24,7 +24,7 @@ declarePublicGauge waku_px_peers_cached, "number of peer exchange peer ENRs cach
 declarePublicGauge waku_px_errors, "number of peer exchange errors", ["type"]
 
 logScope:
-  topics = "wakupx"
+  topics = "waku peer_exchange"
 
 
 const

waku/v2/protocol/waku_relay.nim

@@ -8,10 +8,11 @@ else:
   {.push raises: [].}
 
 import
-  std/[tables, sets],
-  chronos, chronicles, metrics,
-  libp2p/protocols/pubsub/[pubsub, gossipsub],
-  libp2p/protocols/pubsub/rpc/messages,
+  chronos,
+  chronicles, 
+  metrics,
+  libp2p/protocols/pubsub/pubsub,
+  libp2p/protocols/pubsub/gossipsub,
   libp2p/stream/connection
 
 logScope:

waku/v2/protocol/waku_rln_relay/waku_rln_relay_metrics.nim

@@ -11,7 +11,7 @@ import
 export metrics
 
 logScope:
-  topics = "waku-rln-relay.metrics"
+  topics = "waku rln_relay"
 
 func generateBucketsForHistogram*(length: int): seq[float64] =
   ## Generate a custom set of 5 buckets for a given length

waku/v2/protocol/waku_rln_relay/waku_rln_relay_utils.nim

@@ -23,7 +23,7 @@ import
   ../waku_message
 
 logScope:
-  topics = "wakurlnrelayutils"
+  topics = "waku rln_relay"
 
 type MerkleNodeResult* = RlnRelayResult[MerkleNode]
 type RateLimitProofResult* = RlnRelayResult[RateLimitProof]

waku/v2/protocol/waku_store/client.nim

@@ -22,7 +22,7 @@ import
 
 
 logScope:
-  topics = "wakustore.client"
+  topics = "waku store client"
 
 
 type WakuStoreClient* = ref object

waku/v2/protocol/waku_swap/waku_swap_contracts.nim

@@ -10,7 +10,7 @@ import
   chronicles, stew/results
 
 logScope:
-  topics = "wakuswapcontracts"
+  topics = "waku swap"
 
 # TODO Richer error types than string, overkill for now...
 type NodeTaskJsonResult = Result[JsonNode, string]