disconnect a pds when we block it

itaru2622 · Jan 9, 2025 · 3232473 · 3232473
1 parent ad3c38b
commit 3232473
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bgs/admin.go b/bgs/admin.go
@@ -264,6 +264,9 @@ func (bgs *BGS) handleBlockPDS(e echo.Context) error {
 		return err
 	}
 
+	// don't care if this errors, but we should try to disconnect something we just blocked
+	_ = bgs.slurper.KillUpstreamConnection(host, false)
+
 	return e.JSON(200, map[string]any{
 		"success": "true",
 	})

diff --git a/bgs/fedmgr.go b/bgs/fedmgr.go
@@ -745,6 +745,7 @@ func (s *Slurper) KillUpstreamConnection(host string, block bool) error {
 		return fmt.Errorf("killing connection %q: %w", host, ErrNoActiveConnection)
 	}
 	ac.cancel()
+	// cleanup in the run thread subscribeWithRedialer() will delete(s.active, host)
 
 	if block {
 		if err := s.db.Model(models.PDS{}).Where("id = ?", ac.pds.ID).UpdateColumn("blocked", true).Error; err != nil {