From a2d3dfb9f3b6f8c2600b440e6b3d4d00f875bcb2 Mon Sep 17 00:00:00 2001 From: jinnrry Date: Mon, 4 Mar 2024 14:55:24 +0800 Subject: [PATCH] fix --- server/hooks/base.go | 10 +++++++--- server/smtp_server/read_content_test.go | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/server/hooks/base.go b/server/hooks/base.go index 49859c0c..1bf16e7a 100644 --- a/server/hooks/base.go +++ b/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!") + } } diff --git a/server/smtp_server/read_content_test.go b/server/smtp_server/read_content_test.go index da965ffa..95957479 100644 --- a/server/smtp_server/read_content_test.go +++ b/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) {