serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2025-01-13 22:36:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

noot

Browse source
This commit is contained in:
a 2024-06-18 20:11:56 -05:00
parent 01cb878087
commit b491fc5d6c
No known key found for this signature in database
GPG key ID: 374BC539FE795AF0
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddy.go
View file

@ -780,7 +780,7 @@ func exitProcess(ctx context.Context, logger *zap.Logger) {
logger.Error("unclean shutdown") logger.Error("unclean shutdown")
} }
// check if we are in test environment, and dont call exit if we are // check if we are in test environment, and dont call exit if we are
if flag.Lookup("test.v") == nil || !strings.Contains(os.Args[0], ".test") { if flag.Lookup("test.v") == nil && !strings.Contains(os.Args[0], ".test") {
os.Exit(exitCode) os.Exit(exitCode)
} }
}() }()

8
cmd/commandfuncs.go
View file

@ -20,6 +20,7 @@ import (
"crypto/rand" "crypto/rand"
"encoding/json" "encoding/json"
"errors" "errors"
"flag"
"fmt" "fmt"
"io" "io"
"io/fs" "io/fs"
@ -257,6 +258,7 @@ func cmdRun(fl Flags) (int, error) {
// if enabled, reload config file automatically on changes // if enabled, reload config file automatically on changes
// (this better only be used in dev!) // (this better only be used in dev!)
// do not enable this during tests, it will cause leaks
if watchFlag { if watchFlag {
go watchConfigFile(configFile, configAdapterFlag) go watchConfigFile(configFile, configAdapterFlag)
} }
@ -280,7 +282,11 @@ func cmdRun(fl Flags) (int, error) {
} }
} }
select {} if flag.Lookup("test.v") == nil || !strings.Contains(os.Args[0], ".test") {
return caddy.ExitCodeSuccess, nil
} else {
select {}
}
} }
func cmdStop(fl Flags) (int, error) { func cmdStop(fl Flags) (int, error) {