From c339cc7738372ae6bd405cf30a5cf114d47c392b Mon Sep 17 00:00:00 2001
From: Anton Bronnikov <anton@northernforest.nl>
Date: Sun, 8 Sep 2024 22:06:06 +0300
Subject: [PATCH] fix: avoid re-activations of an inactive bridge

---
 .gitignore              | 1 +
 Makefile                | 4 ++--
 bridge/events_bridge.go | 7 +++++++
 docker-compose.yaml     | 4 ++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3d46c39..3ef1488 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 
 /bin/*
 !/bin/.gitkeep
+/cmd/__debug*
 dist
 
 # ide
diff --git a/Makefile b/Makefile
index 23540a3..982117b 100644
--- a/Makefile
+++ b/Makefile
@@ -24,5 +24,5 @@ serve:
 
 .PHONY: docker-compose
 docker-compose:
-	@VPNHAM_LOG_LEVEL=debug docker compose down --remove-orphans
-	@VPNHAM_LOG_LEVEL=debug docker compose up --build || docker compose down --remove-orphans
+	docker compose down --remove-orphans
+	@VPNHAM_LOG_LEVEL=info docker compose up --build || docker compose down --remove-orphans
diff --git a/bridge/events_bridge.go b/bridge/events_bridge.go
index 3e82ee9..7ff8d55 100644
--- a/bridge/events_bridge.go
+++ b/bridge/events_bridge.go
@@ -2,6 +2,7 @@ package bridge
 
 import (
 	"context"
+	"time"
 
 	"github.com/flashbots/vpnham/event"
 	"github.com/flashbots/vpnham/logutils"
@@ -81,6 +82,12 @@ func (s *Server) eventBridgeDeactivated(ctx context.Context, _ *event.BridgeDeac
 	l := logutils.LoggerFromContext(ctx)
 
 	l.Info("Bridge deactivated")
+
+	if r := s.cfg.Reconcile.BridgeActivate.Reapply; r.Enabled() {
+		ba := s.reapply.bridgeActivate
+		ba.Count = 0
+		ba.Next = time.Time{} // disable re-activations of an inactive bridge
+	}
 }
 
 func (s *Server) eventBridgeActivated(ctx context.Context, e *event.BridgeActivated, failureSink chan<- error) {
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 79af73b..a99797f 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -40,6 +40,7 @@ services:
       VPNHAM_LOG_MODE: dev
     ports:
       - 8000:8000
+      - 8100:8080
     volumes:
       - type: bind
         source: ./.dev/br-lft-act.yaml
@@ -66,6 +67,7 @@ services:
         target: /app/.vpnham.yaml
     ports:
       - 8001:8001
+      - 8101:8080
     cap_add:
       - NET_ADMIN
     networks:
@@ -84,6 +86,7 @@ services:
       VPNHAM_LOG_MODE: dev
     ports:
       - 8010:8010
+      - 8110:8080
     volumes:
       - type: bind
         source: ./.dev/br-rgt-act.yaml
@@ -106,6 +109,7 @@ services:
       VPNHAM_LOG_MODE: dev
     ports:
       - 8011:8011
+      - 8111:8080
     volumes:
       - type: bind
         source: ./.dev/br-rgt-sby.yaml