Merge branch 'main' of github.com:wugeer/dae-wing

daeuniverse · Mar 8, 2024 · 18a0587 · 18a0587
2 parents ef08d55 + df283ad
commit 18a0587
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/dae-core b/dae-core
diff --git a/dae/run.go b/dae/run.go
@@ -80,9 +80,12 @@ func Run(log *logrus.Logger, conf *daeConfig.Config, externGeoDataDirs []string,
 			<-readyChan
 			log.Infoln("Ready")
 		}()
-		if listener, err = c.ListenAndServe(readyChan, conf.Global.TproxyPort); err != nil {
-			log.Errorln("ListenAndServe:", err)
-		}
+		control.GetDaeNetns().With(func() error {
+			if listener, err = c.ListenAndServe(readyChan, conf.Global.TproxyPort); err != nil {
+				log.Errorln("ListenAndServe:", err)
+			}
+			return err
+		})
 		// Exit
 		ChReloadConfigs <- nil
 	}()