summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMohammed Al Sahaf <msaa1990@gmail.com>2019-10-16 00:37:46 +0300
committerMatt Holt <mholt@users.noreply.github.com>2019-10-15 15:37:46 -0600
commite3726588b416682db28ea9173bf2c36e4554ce05 (patch)
tree134ff2406bb89000b20555c84cf1b68154835a56 /cmd
parentabf5ab340ed76792214ae80c62df7abe0ad1b8a8 (diff)
v2: Project-and-CI-wide linter config (#2812)
* v2: split golangci-lint configuration into its own file to allow code editors to take advantage of it * v2: simplify code * v2: set the correct lint output formatting * v2: invert the logic of linter's configuration of output formatting to allow the editor convenience over CI-specific customization. Customize the output format in CI by passing the flag. * v2: remove irrelevant golangci-lint config
Diffstat (limited to 'cmd')
-rw-r--r--cmd/main.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/cmd/main.go b/cmd/main.go
index aea020f..6447e73 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -118,7 +118,6 @@ func loadConfig(configFile, adapterName string) ([]byte, error) {
if os.IsNotExist(err) {
// okay, no default Caddyfile; pretend like this never happened
cfgAdapter = nil
- err = nil
} else if err != nil {
// default Caddyfile exists, but error reading it
return nil, fmt.Errorf("reading default Caddyfile: %v", err)