Skip to content

Commit e842d2b

Browse files
author
anahan
committed
Create socket before fpm start
1 parent 7417120 commit e842d2b

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

main.go

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ func main() {
5555
os.Exit(1)
5656
}
5757

58+
var err error
59+
errCh := make(chan error, 1)
60+
dataChan := make(chan string, 1)
61+
62+
dataListener := NewDataListener(viper.GetString("wrapper-socket"), dataChan, errCh)
63+
if err = dataListener.Start(); err != nil {
64+
fmt.Printf("Can't start listen: %v", err)
65+
os.Exit(1)
66+
}
67+
defer dataListener.Stop()
68+
5869
signalCh := make(chan os.Signal, 1)
5970
signal.Notify(signalCh, os.Interrupt)
6071
signal.Notify(signalCh, os.Kill)
@@ -68,8 +79,7 @@ func main() {
6879
cmd.Args = append(cmd.Args, "--fpm-config", viper.GetString("fpm-config"))
6980
cmd.Args = append(cmd.Args, findFpmArgs()...)
7081

71-
err := cmd.Start()
72-
if err != nil {
82+
if err = cmd.Start(); err != nil {
7383
fmt.Printf("exec.Command: %v", err)
7484
os.Exit(1)
7585
}
@@ -81,13 +91,6 @@ func main() {
8191
procErrCh <- cmd.Wait()
8292
}()
8393

84-
errCh := make(chan error, 1)
85-
86-
dataChan := make(chan string, 1)
87-
dataListener := NewDataListener(viper.GetString("wrapper-socket"), dataChan, errCh)
88-
dataListener.Start()
89-
defer dataListener.Stop()
90-
9194
http.Handle(viper.GetString("metrics-path"), promhttp.Handler())
9295
go func() {
9396
errCh <- http.ListenAndServe(viper.GetString("listen"), nil)

0 commit comments

Comments
 (0)