10000 Simplify code · symfony-cli/symfony-cli@d66d41b · GitHub
[go: up one dir, main page]
Skip to content

Commit d66d41b

Browse files
fabpotfabpot
committed
Simplify code
1 parent 64c603d commit d66d41b

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

‎local/runner.go

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ func NewRunner(pidFile *pid.PidFile, mode runnerMode) (*Runner, error) {
8080
}
8181

8282
func (r *Runner) Run() error {
83+
logger := terminal.Logger.With().Str("cmd", r.pidFile.String()).Logger()
8384
if r.mode == RunnerModeLoopDetached {
8485
if !reexec.IsChild() {
8586
varDir := filepath.Join(util.GetHomeDir(), "var")
@@ -126,7 +127,7 @@ func (r *Runner) Run() error {
126127
continue
127128
}
128129

129-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Got event: " + event.Event().String())
130+
logger.Debug().Msg("Got event: " + event.Event().String())
130131

131132
select {
132133
case restartChan <- true:
@@ -139,10 +140,10 @@ func (r *Runner) Run() error {
139140
if fi, err := os.Stat(watched); err != nil {
140141
continue
141142
} else if fi.IsDir() {
142-
terminal.Logger.Info().Str("cmd", r.pidFile.String()).Msg("Watching directory " + watched)
143+
logger.Info().Msg("Watching directory " + watched)
143144
watched = filepath.Join(watched, "...")
144145
} else {
145-
terminal.Logger.Info().Str("cmd", r.pidFile.String()).Msg("Watching file " + watched)
146+
logger.Info().Msg("Watching file " + watched)
146147
}
147148
if err := inotify.Watch(watched, c, inotify.All); err != nil {
148149
return errors.Wrapf(err, `could not watch "%s"`, watched)
@@ -179,10 +180,10 @@ func (r *Runner) Run() error {
179180
reexec.NotifyForeground("started")
180181
}
181182

182-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Waiting for channels (first boot)")
183+
logger.Debug().Msg("Waiting for channels (first boot)")
183184
select {
184185
case err := <-cmdExitChan:
185-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Received exit (first boot)")
186+
logger.Debug().Msg("Received exit (first boot)")
186187
if err != nil {
187188
return errors.Wrapf(err, `command "%s" failed early`, r.pidFile)
188189
}
@@ -193,7 +194,7 @@ func (r *Runner) Run() error {
193194
// finished later one
194195
go func() { cmdExitChan <- err }()
195196
case <-timer.C:
196-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Received timer message (first boot)")
197+
logger.Debug().Msg("Received timer message (first boot)")
197198
}
198199
}
199200

@@ -214,73 +215,73 @@ func (r *Runner) Run() error {
214215

215216
select {
216217
case sig := <-sigChan:
217-
terminal.Logger.Info().Str("cmd", r.pidFile.String()).Msgf("Signal \"%s\" received, forwarding and exiting\n", sig)
218+
logger.Info().Msgf("Signal \"%s\" received, forwarding and exiting\n", sig)
218219
err := cmd.Process.Signal(sig)
219220
if err != nil && runtime.GOOS == "windows" && strings.Contains(err.Error(), "not supported by windows") {
220221
return exec.Command("CMD", "/C", "TASKKILL", "/F", "/PID", strconv.Itoa(cmd.Process.Pid)).Run()
221222
}
222223
return err
223224
case <-restartChan:
224-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Received restart")
225+
logger.Debug().Msg("Received restart")
225226
// We use SIGTERM here because it's nicer and thus when we use our
226227
// wrappers, signal will be nicely forwarded
227228
cmd.Process.Signal(syscall.SIGTERM)
228229
// we need to drain cmdExit channel to unblock cmd channel receiver
229230
<-cmdExitChan
230231
// Command exited
231232
case err := <-cmdExitChan:
232-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Received exit")
233+
logger.Debug().Msg("Received exit")
233234
err = errors.Wrapf(err, `command "%s" failed`, r.pidFile)
234235

235236
if err == nil && r.SuccessHook != nil {
236-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Running success hook")
237+
logger.Debug().Msg("Running success hook")
237238
r.SuccessHook(r, cmd)
238239
}
239240

240241
// Command is NOT set up to loop, stop here and remove the pidFile
241242
// if the command is successful
242243
if !looping {
243244
if err != nil {
244-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Not looping, exiting with error")
245+
logger.Debug().Msg("Not looping, exiting with error")
245246
return err
246247
}
247248

248-
terminal.Logger.Debug().Str("cmd", r.pidFile.String()).Msg("Removing pid file")
249+
logger.Debug().Msg("Removing pid file")
249250
return r.pidFile.Remove()
250251
}
251-
terminal.Logger.Debug().Msg("Looping")
252+
logger.Debug().Msg("Looping")
252253

253254
// Command is set up to restart on exit (usually PHP builtin
254255
// server), so we restart immediately without waiting
255256
if r.AlwaysRestartOnExit {
256-
terminal.Logger.Error().Str("cmd", r.pidFile.String()).Msg("command exited, restarting it immediately")
257+
logger.Error().Msg("command exited, restarting it immediately")
257258
continue
258259
}
259260

260261
// In case of error we want to wait up-to 5 seconds before
261262
// restarting the command, this avoids overloading the system with a
262263
// failing command
263264
if err != nil {
264-
terminal.Logger.Error().Str("cmd", r.pidFile.String()).Msgf(`command exited: %s, waiting 5 seconds before restarting it`, err)
265+
logger.Error().Msgf(`command exited: %s, waiting 5 seconds before restarting it`, err)
265266
timer.Reset(5 * time.Second)
266267
}
267268

268269
// Wait for a timer to expire or a file to be changed to restart
269270
// or a signal to be received to exit
270-
terminal.Logger.Debug().Msg("Waiting for channels")
271+
logger.Debug().Msg("Waiting for channels")
271272
select {
272273
case sig := <-sigChan:
273-
terminal.Logger.Info().Msgf(`Signal "%s" received, exiting`, sig)
274+
logger.Info().Msgf(`Signal "%s" received, exiting`, sig)
274275
return nil
275276
case <-restartChan:
276-
terminal.Logger.Debug().Msg("Received restart")
277+
logger.Debug().Msg("Received restart")
277278
timer.Stop()
278279
case <-timer.C:
279-
terminal.Logger.Debug().Msg("Received timer message")
280+
logger.Debug().Msg("Received timer message")
280281
}
281282
}
282283

283-
terminal.Logger.Info().Str("cmd", r.pidFile.String()).Msg("Restarting command")
284+
logger.Info().Msg("Restarting command")
284285
}
285286
}
286287

0 commit comments

Comments
 (0)
0