fix: fix panic when update config (#62)

Li4n0 · Sep 24, 2022 · 48f55c5 · 48f55c5
1 parent ca911b6
commit 48f55c5
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go
@@ -204,9 +204,9 @@ func (s *Server) Run() {
 	defer func() {
 		if s.Enable {
 			log.Error("DNS Server exited unexpectedly")
+			s.Enable = false
+			s.livingLock.Unlock()
 		}
-		s.Enable = false
-		s.livingLock.Unlock()
 	}()
 
 	if err := s.UpdateRules(); err != nil {

diff --git a/pkg/ftp/ftp.go b/pkg/ftp/ftp.go
@@ -359,9 +359,9 @@ func (s *Server) Run() {
 	defer func() {
 		if s.Enable {
 			log.Error("FTP Server exited unexpectedly")
+			s.Enable = false
+			s.livingLock.Unlock()
 		}
-		s.Enable = false
-		s.livingLock.Unlock()
 	}()
 
 	if err := s.UpdateRules(); err != nil {

diff --git a/pkg/ldap/ldap.go b/pkg/ldap/ldap.go
@@ -156,9 +156,9 @@ func (s *Server) Run() {
 	defer func() {
 		if s.Enable {
 			log.Error("LDAP Server exited unexpectedly")
+			s.Enable = false
+			s.livingLock.Unlock()
 		}
-		s.Enable = false
-		s.livingLock.Unlock()
 	}()
 
 	if err := s.UpdateRules(); err != nil {

diff --git a/pkg/mysql/mysql.go b/pkg/mysql/mysql.go
@@ -284,9 +284,9 @@ func (s *Server) Run() {
 	defer func() {
 		if s.Enable {
 			log.Error("MySQL Server exited unexpectedly")
+			s.Enable = false
+			s.livingLock.Unlock()
 		}
-		s.Enable = false
-		s.livingLock.Unlock()
 	}()
 	if err := s.UpdateRules(); err != nil {
 		log.Error(err.Error())

diff --git a/pkg/rmi/rmi.go b/pkg/rmi/rmi.go
@@ -165,9 +165,9 @@ func (s *Server) Run() {
 	defer func() {
 		if s.Enable {
 			log.Error("RMI Server exited unexpectedly")
+			s.Enable = false
+			s.livingLock.Unlock()
 		}
-		s.Enable = false
-		s.livingLock.Unlock()
 	}()
 
 	if err := s.UpdateRules(); err != nil {