diff options
| author | Mohammed Al Sahaf <[email protected]> | 2024-04-19 00:40:12 +0300 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-18 15:40:12 -0600 |
| commit | 8f87c5d9938d64942f193a599a6d5472edeb15da (patch) | |
| tree | 1623f5c344d6386821eed3b894bc75462c2c6f73 | |
| parent | c6673ad4d8c3253179d697f06aac458e48e56546 (diff) | |
| download | caddy-8f87c5d9938d64942f193a599a6d5472edeb15da.tar.gz caddy-8f87c5d9938d64942f193a599a6d5472edeb15da.zip | |
cmd: Only validate config is proper JSON if config slice has data (#6250)
* cmd: fix error when running without config
* ci: add smoke test
| -rw-r--r-- | .github/workflows/ci.yml | 6 | ||||
| -rw-r--r-- | cmd/main.go | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 309ef7935..32da779ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -101,6 +101,12 @@ jobs: run: | go build -tags nobdger -trimpath -ldflags="-w -s" -v + - name: Smoke test Caddy + working-directory: ./cmd/caddy + run: | + ./caddy start + ./caddy stop + - name: Publish Build Artifact uses: actions/upload-artifact@v4 with: diff --git a/cmd/main.go b/cmd/main.go index ac9786faf..31a121aa6 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -199,7 +199,7 @@ func loadConfigWithLogger(logger *zap.Logger, configFile, adapterName string) ([ zap.Int("line", warn.Line)) } config = adaptedConfig - } else { + } else if len(config) != 0 { // validate that the config is at least valid JSON err = json.Unmarshal(config, new(any)) if err != nil { |