From 605c87ade0e12bbcb9bd15ddb82b59a0f71ab170 Mon Sep 17 00:00:00 2001
From: Hanno Cornelius <68783915+jm-clius@users.noreply.github.com>
Date: Wed, 2 Jun 2021 16:54:38 +0200
Subject: [PATCH] Mount keepalive on chat2bridge and bridge (#591)

---
 examples/v2/matterbridge/chat2bridge.nim | 7 +++++++
 waku/common/wakubridge.nim               | 2 ++
 waku/v2/node/wakunode2.nim               | 3 +++
 3 files changed, 12 insertions(+)

diff --git a/examples/v2/matterbridge/chat2bridge.nim b/examples/v2/matterbridge/chat2bridge.nim
index d1a221b09..f44e0ae07 100644
--- a/examples/v2/matterbridge/chat2bridge.nim
+++ b/examples/v2/matterbridge/chat2bridge.nim
@@ -95,6 +95,11 @@ proc toMatterbridge(cmb: Chat2MatterBridge, msg: WakuMessage) {.gcsafe.} =
     chat2_mb_dropped.inc(labelValues = ["duplicate"])
     return
 
+  if msg.contentTopic != cmb.contentTopic:
+    # Only bridge messages on the configured content topic
+    chat2_mb_dropped.inc(labelValues = ["filtered"])
+    return
+
   trace "Post chat2 message to Matterbridge"
 
   chat2_mb_transfers.inc(labelValues = ["chat2_to_mb"])
@@ -249,6 +254,8 @@ when isMainModule:
 
   # Now load rest of config
   # Mount configured Waku v2 protocols
+  mountKeepalive(bridge.nodev2)
+
   if conf.store:
     mountStore(bridge.nodev2)
 
diff --git a/waku/common/wakubridge.nim b/waku/common/wakubridge.nim
index a08defb04..90d2ba775 100644
--- a/waku/common/wakubridge.nim
+++ b/waku/common/wakubridge.nim
@@ -254,6 +254,8 @@ when isMainModule:
   elif conf.fleetV1 == test: connectToNodes(bridge.nodev1, WhisperNodesTest)
 
   # Mount configured Waku v2 protocols
+  mountKeepalive(bridge.nodev2)
+  
   if conf.store:
     mountStore(bridge.nodev2, persistMessages = false)  # Bridge does not persist messages
 
diff --git a/waku/v2/node/wakunode2.nim b/waku/v2/node/wakunode2.nim
index 63ccbcc96..e863dea09 100644
--- a/waku/v2/node/wakunode2.nim
+++ b/waku/v2/node/wakunode2.nim
@@ -642,8 +642,11 @@ when isMainModule:
 
   proc startMetricsServer(serverIp: ValidIpAddress, serverPort: Port) =
       info "Starting metrics HTTP server", serverIp, serverPort
+      
       metrics.startHttpServer($serverIp, serverPort)
 
+      info "Metrics HTTP server started", serverIp, serverPort
+
   proc startMetricsLog() =
     # https://github.com/nim-lang/Nim/issues/17369
     var logMetrics: proc(udata: pointer) {.gcsafe, raises: [Defect].}