diff options
| author | Francis Lavoie <lavofr@gmail.com> | 2020-05-21 15:09:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 13:09:49 -0600 |
| commit | bb67e19d7bacd70a13647538c8e9820eb42090b2 (patch) | |
| tree | e210b62e41bdf31da0c812268ecf7c9393799daf /cmd | |
| parent | 1dc4ec2d77f6f239f4c17e8ba754e71655796a4d (diff) | |
cmd: hash-password: Fix broken terminal state on SIGINT (#3416)
* caddyauth: Fix hash-password broken terminal state on SIGINT
* caddycmd: Move TrapSignals calls to only subcommands that run long
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/commandfuncs.go | 2 | ||||
| -rw-r--r-- | cmd/main.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go index a824789..875fb5a 100644 --- a/cmd/commandfuncs.go +++ b/cmd/commandfuncs.go @@ -148,6 +148,8 @@ func cmdStart(fl Flags) (int, error) { } func cmdRun(fl Flags) (int, error) { + caddy.TrapSignals() + runCmdConfigFlag := fl.String("config") runCmdConfigAdapterFlag := fl.String("adapter") runCmdResumeFlag := fl.Bool("resume") diff --git a/cmd/main.go b/cmd/main.go index 4fd8d68..00d5d13 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -51,8 +51,6 @@ func init() { // Main implements the main function of the caddy command. // Call this if Caddy is to be the main() if your program. func Main() { - caddy.TrapSignals() - switch len(os.Args) { case 0: fmt.Printf("[FATAL] no arguments provided by OS; args[0] must be command\n") |