jinnrry il y a 2 ans
Parent
commit
a2d3dfb9f3
2 fichiers modifiés avec 8 ajouts et 4 suppressions
  1. 7 3
      server/hooks/base.go
  2. 1 1
      server/smtp_server/read_content_test.go

+ 7 - 3
server/hooks/base.go

@@ -175,22 +175,26 @@ func Init(serverVersion string) {
 
 			pluginNo++
 
-			HookList = append(HookList, NewHookSender(socketPath, info.Name(), serverVersion))
-
 			go func() {
 				stat, err := p.Wait()
 				log.Errorf("[%s] Plugin Stop. Error:%v Stat:%v", info.Name(), err, stat.String())
 			}()
 
+			loadSucc := false
 			for i := 0; i < 5; i++ {
 				time.Sleep(1 * time.Second)
 				if _, err := os.Stat(socketPath); err == nil {
+					loadSucc = true
 					break
 				}
 				if i == 4 {
-					panic(fmt.Sprintf("[%s] Start Fail!", info.Name()))
+					log.Errorf(fmt.Sprintf("[%s] Start Fail!", info.Name()))
 				}
 			}
+			if loadSucc {
+				HookList = append(HookList, NewHookSender(socketPath, info.Name(), serverVersion))
+				log.Infof("[%s] Plugin Load Success!")
+			}
 
 		}
 

+ 1 - 1
server/smtp_server/read_content_test.go

@@ -43,7 +43,7 @@ func testInit() {
 	parsemail2.Init()
 	db.Init()
 	session.Init()
-	hooks.Init()
+	hooks.Init("dev")
 }
 
 func TestNuisanace(t *testing.T) {