conflicts

elastic · Jun 20, 2024 · a0e1f79 · a0e1f79
1 parent 1589102
commit a0e1f79
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/internal/pkg/agent/appinit/appinit.go b/internal/pkg/agent/appinit/appinit.go
@@ -11,18 +11,21 @@ import (
 )
 
 var stopSvcChan = make(chan bool)
+var once sync.Once
 var stopBeat = func() {
 	close(stopSvcChan)
 }
 
 func init() {
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		wg.Done()
-		service.ProcessWindowsControlEvents(stopBeat)
-	}()
-	wg.Wait()
+	once.Do(func() {
+		var wg sync.WaitGroup
+		wg.Add(1)
+		go func() {
+			wg.Done()
+			service.ProcessWindowsControlEvents(stopBeat)
+		}()
+		wg.Wait()
+	})
 }
 
 func StopSvcChan() chan bool {

diff --git a/main.go b/main.go
@@ -10,6 +10,7 @@ import (
 	"os"
 	"time"
 
+	_ "github.com/elastic/elastic-agent/internal/pkg/agent/appinit"
 	"github.com/elastic/elastic-agent/internal/pkg/agent/cmd"
 	"github.com/elastic/elastic-agent/pkg/core/process"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ import ( @@
     	"os"
     	"time"
+    	_ "github.com/elastic/elastic-agent/internal/pkg/agent/appinit"
     	"github.com/elastic/elastic-agent/internal/pkg/agent/cmd"
     	"github.com/elastic/elastic-agent/pkg/core/process"
     )
@@ Expand Down @@