serv/caddy
1
0
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-27 22:23:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

noot

Browse source
This commit is contained in:
a 2024-06-18 21:18:38 -05:00
parent 926fb82f6b
commit edf4168c8e
No known key found for this signature in database
GPG key ID: 374BC539FE795AF0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
caddytest/caddytest.go
View file

@ -201,7 +201,7 @@ func (tc *Tester) startServer() error {
// start inprocess caddy server // start inprocess caddy server
go func() { go func() {
caddycmd.MainForTesting("caddy", "run", "--config", tc.configFileName, "--adapter", "caddyfile") caddycmd.MainForTesting("run", "--config", tc.configFileName, "--adapter", "caddyfile")
}() }()
// wait for caddy admin api to start. it should happen quickly. // wait for caddy admin api to start. it should happen quickly.
for retries := 10; retries > 0 && isCaddyAdminRunning() != nil; retries-- { for retries := 10; retries > 0 && isCaddyAdminRunning() != nil; retries-- {

2
cmd/main.go
View file

@ -94,7 +94,7 @@ func MainForTesting(args ...string) error {
Version: rootCmd.Version, Version: rootCmd.Version,
} }
tmpRootCmp.SetArgs(args) tmpRootCmp.SetArgs(args)
if err := rootCmd.Execute(); err != nil { if err := tmpRootCmp.Execute(); err != nil {
return err return err
} }
return nil return nil