@@ -55,6 +55,17 @@ func main() {
55
55
os .Exit (1 )
56
56
}
57
57
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
+
58
69
signalCh := make (chan os.Signal , 1 )
59
70
signal .Notify (signalCh , os .Interrupt )
60
71
signal .Notify (signalCh , os .Kill )
@@ -68,8 +79,7 @@ func main() {
68
79
cmd .Args = append (cmd .Args , "--fpm-config" , viper .GetString ("fpm-config" ))
69
80
cmd .Args = append (cmd .Args , findFpmArgs ()... )
70
81
71
- err := cmd .Start ()
72
- if err != nil {
82
+ if err = cmd .Start (); err != nil {
73
83
fmt .Printf ("exec.Command: %v" , err )
74
84
os .Exit (1 )
75
85
}
@@ -81,13 +91,6 @@ func main() {
81
91
procErrCh <- cmd .Wait ()
82
92
}()
83
93
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
-
91
94
http .Handle (viper .GetString ("metrics-path" ), promhttp .Handler ())
92
95
go func () {
93
96
errCh <- http .ListenAndServe (viper .GetString ("listen" ), nil )
0 commit comments