fix: channel is blocked when error equals nil

Signed-off-by: ComixHe <[email protected]>
black-desk · Oct 26, 2023 · 944d061 · 944d061
1 parent 19010ed
commit 944d061
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 11 deletions.
diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md
@@ -42,10 +42,10 @@ The "file exists" is error message of EEXIST, which means that:
    2. Now you can just simply remove the route table and nftable ruleset by:
 
       ```bash
-      sudo ip route del table 300 local default dev lo scope host
-      sudo ip -6 route del table 300 local default dev lo scope host
-      sudo ip rule del fwmark 3000 lookup 300
-      sudo ip -6 rule del fwmark 3000 lookup 300
+      sudo ip route del table 400 local default dev lo scope host
+      sudo ip -6 route del table 400 local default dev lo scope host
+      sudo ip rule del fwmark 3000 lookup 400
+      sudo ip -6 rule del fwmark 3000 lookup 400
       sudo nft flush table inet cgtproxy
       sudo nft delete table inet cgtproxy
       ```
diff --git a/pkg/nftman/private.go b/pkg/nftman/private.go
@@ -385,10 +385,7 @@ func getNFTableRules() string {
 }
 
 func (nft *NFTManager) genSetElement(route *types.Route) (ret nftables.SetElement, err error) {
-	defer Wrap(&err, "generating set element for route",
-		"Path", route.Path,
-		"Target", route.Target,
-	)
+	defer Wrap(&err, "generating set element for route %v", route)
 
 	nft.log.Debugw("Generating set element for new cgroup route.",
 		"Path", route.Path,

diff --git a/pkg/routeman/public.go b/pkg/routeman/public.go
@@ -41,9 +41,6 @@ func (m *RouteManager) RunRouteManager(ctx context.Context) (err error) {
 		newErr := m.handleNewCgroups(newCGroups)
 		delErr := m.handleDeleteCgroups(deleteCGroups)
 		eventsErr := errors.Join(newErr, delErr)
-		if eventsErr == nil {
-			continue
-		}
 
 		if events.Result != nil {
 			events.Result <- eventsErr