From 1afec627c2e334e42eaa81f730ecd1b942a8ea5f Mon Sep 17 00:00:00 2001 From: Viktor Kirilov Date: Wed, 10 Jun 2020 11:48:01 +0300 Subject: [PATCH] proper name for topics so that we can filter dynamically using chronicles (#210) * proper name for topics so that we can filter dynamically using chronicles * lowercase --- libp2p/connection.nim | 2 +- libp2p/multistream.nim | 2 +- libp2p/muxers/mplex/coder.nim | 2 +- libp2p/muxers/mplex/lpchannel.nim | 2 +- libp2p/muxers/mplex/mplex.nim | 2 +- libp2p/muxers/muxer.nim | 2 +- libp2p/protocols/identify.nim | 2 +- libp2p/protocols/pubsub/floodsub.nim | 2 +- libp2p/protocols/pubsub/gossipsub.nim | 2 +- libp2p/protocols/pubsub/pubsub.nim | 2 +- libp2p/protocols/pubsub/pubsubpeer.nim | 2 +- libp2p/protocols/pubsub/rpc/message.nim | 2 +- libp2p/protocols/pubsub/timedcache.nim | 2 +- libp2p/protocols/secure/noise.nim | 2 +- libp2p/protocols/secure/secio.nim | 2 +- libp2p/stream/bufferstream.nim | 2 +- libp2p/stream/chronosstream.nim | 2 +- libp2p/switch.nim | 2 +- libp2p/transports/tcptransport.nim | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/libp2p/connection.nim b/libp2p/connection.nim index e18f87689..11bc93ab9 100644 --- a/libp2p/connection.nim +++ b/libp2p/connection.nim @@ -20,7 +20,7 @@ when chronicles.enabledLogLevel == LogLevel.TRACE: export lpstream logScope: - topic = "Connection" + topics = "connection" const ConnectionTrackerName* = "libp2p.connection" diff --git a/libp2p/multistream.nim b/libp2p/multistream.nim index ca24c8695..61dc84419 100644 --- a/libp2p/multistream.nim +++ b/libp2p/multistream.nim @@ -15,7 +15,7 @@ import connection, protocols/protocol logScope: - topic = "Multistream" + topics = "multistream" const MsgSize* = 64*1024 diff --git a/libp2p/muxers/mplex/coder.nim b/libp2p/muxers/mplex/coder.nim index 850b177bb..03ec3ab76 100644 --- a/libp2p/muxers/mplex/coder.nim +++ b/libp2p/muxers/mplex/coder.nim @@ -17,7 +17,7 @@ import types, ../../stream/lpstream logScope: - topic = "MplexCoder" + topics = "mplexcoder" type Msg* = tuple diff --git a/libp2p/muxers/mplex/lpchannel.nim b/libp2p/muxers/mplex/lpchannel.nim index a753d16c4..e2c5b6981 100644 --- a/libp2p/muxers/mplex/lpchannel.nim +++ b/libp2p/muxers/mplex/lpchannel.nim @@ -21,7 +21,7 @@ import types, export lpstream logScope: - topic = "MplexChannel" + topics = "mplexchannel" ## Channel half-closed states ## diff --git a/libp2p/muxers/mplex/mplex.nim b/libp2p/muxers/mplex/mplex.nim index d4b21120b..7bddcf369 100644 --- a/libp2p/muxers/mplex/mplex.nim +++ b/libp2p/muxers/mplex/mplex.nim @@ -20,7 +20,7 @@ import ../muxer, lpchannel logScope: - topic = "Mplex" + topics = "mplex" type Mplex* = ref object of Muxer diff --git a/libp2p/muxers/muxer.nim b/libp2p/muxers/muxer.nim index 7a95b1c04..400edc256 100644 --- a/libp2p/muxers/muxer.nim +++ b/libp2p/muxers/muxer.nim @@ -13,7 +13,7 @@ import ../protocols/protocol, ../errors logScope: - topic = "Muxer" + topics = "muxer" type StreamHandler* = proc(conn: Connection): Future[void] {.gcsafe.} diff --git a/libp2p/protocols/identify.nim b/libp2p/protocols/identify.nim index e5267863f..439b88af4 100644 --- a/libp2p/protocols/identify.nim +++ b/libp2p/protocols/identify.nim @@ -19,7 +19,7 @@ import ../protobuf/minprotobuf, ../utility logScope: - topic = "Identify" + topics = "identify" const IdentifyCodec* = "/ipfs/id/1.0.0" diff --git a/libp2p/protocols/pubsub/floodsub.nim b/libp2p/protocols/pubsub/floodsub.nim index 0f0ad5f2a..64e89e704 100644 --- a/libp2p/protocols/pubsub/floodsub.nim +++ b/libp2p/protocols/pubsub/floodsub.nim @@ -21,7 +21,7 @@ import pubsub, ../../errors logScope: - topic = "FloodSub" + topics = "floodsub" const FloodSubCodec* = "/floodsub/1.0.0" diff --git a/libp2p/protocols/pubsub/gossipsub.nim b/libp2p/protocols/pubsub/gossipsub.nim index cbe932ccd..ae022cf8a 100644 --- a/libp2p/protocols/pubsub/gossipsub.nim +++ b/libp2p/protocols/pubsub/gossipsub.nim @@ -24,7 +24,7 @@ import pubsub, ../../utility logScope: - topic = "GossipSub" + topics = "gossipsub" const GossipSubCodec* = "/meshsub/1.0.0" diff --git a/libp2p/protocols/pubsub/pubsub.nim b/libp2p/protocols/pubsub/pubsub.nim index 2dd811e91..868289ea2 100644 --- a/libp2p/protocols/pubsub/pubsub.nim +++ b/libp2p/protocols/pubsub/pubsub.nim @@ -20,7 +20,7 @@ export PubSubPeer export PubSubObserver logScope: - topic = "PubSub" + topics = "pubsub" declareGauge(libp2p_pubsub_peers, "pubsub peer instances") declareGauge(libp2p_pubsub_topics, "pubsub subscribed topics") diff --git a/libp2p/protocols/pubsub/pubsubpeer.nim b/libp2p/protocols/pubsub/pubsubpeer.nim index 696d9cea0..c3d0b48ba 100644 --- a/libp2p/protocols/pubsub/pubsubpeer.nim +++ b/libp2p/protocols/pubsub/pubsubpeer.nim @@ -21,7 +21,7 @@ import rpc/[messages, message, protobuf], import metrics logScope: - topic = "PubSubPeer" + topics = "pubsubpeer" type PubSubObserver* = ref object diff --git a/libp2p/protocols/pubsub/rpc/message.nim b/libp2p/protocols/pubsub/rpc/message.nim index 5ceeed8d5..6e0a59412 100644 --- a/libp2p/protocols/pubsub/rpc/message.nim +++ b/libp2p/protocols/pubsub/rpc/message.nim @@ -18,7 +18,7 @@ import messages, protobuf, ../../../protobuf/minprotobuf logScope: - topic = "PubSubMessage" + topics = "pubsubmessage" const PubSubPrefix = "libp2p-pubsub:" diff --git a/libp2p/protocols/pubsub/timedcache.nim b/libp2p/protocols/pubsub/timedcache.nim index 51ec6a6d9..e7d08f3b2 100644 --- a/libp2p/protocols/pubsub/timedcache.nim +++ b/libp2p/protocols/pubsub/timedcache.nim @@ -11,7 +11,7 @@ import tables import chronos, chronicles logScope: - topic = "TimedCache" + topics = "timedcache" const Timeout* = 10.seconds # default timeout in ms diff --git a/libp2p/protocols/secure/noise.nim b/libp2p/protocols/secure/noise.nim index 362f9da71..dfc30a938 100644 --- a/libp2p/protocols/secure/noise.nim +++ b/libp2p/protocols/secure/noise.nim @@ -22,7 +22,7 @@ import secure, ../../stream/bufferstream logScope: - topic = "noise" + topics = "noise" const # https://godoc.org/github.com/libp2p/go-libp2p-noise#pkg-constants diff --git a/libp2p/protocols/secure/secio.nim b/libp2p/protocols/secure/secio.nim index d2edd4f5f..ffc9d7706 100644 --- a/libp2p/protocols/secure/secio.nim +++ b/libp2p/protocols/secure/secio.nim @@ -19,7 +19,7 @@ import secure, export hmac, sha2, sha, hash, rijndael, bcmode logScope: - topic = "secio" + topics = "secio" const SecioCodec* = "/secio/1.0.0" diff --git a/libp2p/stream/bufferstream.nim b/libp2p/stream/bufferstream.nim index f0a7bea42..fef61bc4e 100644 --- a/libp2p/stream/bufferstream.nim +++ b/libp2p/stream/bufferstream.nim @@ -40,7 +40,7 @@ when chronicles.enabledLogLevel == LogLevel.TRACE: export lpstream logScope: - topic = "BufferStream" + topics = "bufferstream" declareGauge libp2p_open_bufferstream, "open BufferStream instances" diff --git a/libp2p/stream/chronosstream.nim b/libp2p/stream/chronosstream.nim index 609d0a47d..5ea46722b 100644 --- a/libp2p/stream/chronosstream.nim +++ b/libp2p/stream/chronosstream.nim @@ -11,7 +11,7 @@ import chronos, chronicles import lpstream, ../utility logScope: - topic = "ChronosStream" + topics = "chronosstream" type ChronosStream* = ref object of LPStream client: StreamTransport diff --git a/libp2p/switch.nim b/libp2p/switch.nim index 9b43664e7..9012cdd98 100644 --- a/libp2p/switch.nim +++ b/libp2p/switch.nim @@ -23,7 +23,7 @@ import connection, peer logScope: - topic = "Switch" + topics = "switch" #TODO: General note - use a finite state machine to manage the different # steps of connections establishing and upgrading. This makes everything diff --git a/libp2p/transports/tcptransport.nim b/libp2p/transports/tcptransport.nim index 9799471dd..eb5862494 100644 --- a/libp2p/transports/tcptransport.nim +++ b/libp2p/transports/tcptransport.nim @@ -18,7 +18,7 @@ import transport, ../stream/chronosstream logScope: - topic = "TcpTransport" + topics = "tcptransport" const TcpTransportTrackerName* = "libp2p.tcptransport"