From ac1f3bfaaa27ce706ad5a845dc071456a8bc588e Mon Sep 17 00:00:00 2001
From: Arthur Silva <arxdsilva@gmail.com>
Date: Tue, 31 Oct 2017 14:12:05 -0200
Subject: [PATCH] a few code improvements (#1936)
caddy.go:569: could be simplified
sigtrap_posix.go:87: value of inst is never used
upgrade.go:151: should omit nil check; len() for nil slices is defined as zero
---
caddy.go | 7 +------
sigtrap_posix.go | 2 +-
upgrade.go | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/caddy.go b/caddy.go
index 902a1a394..4c1cbb0ff 100644
--- a/caddy.go
+++ b/caddy.go
@@ -565,12 +565,7 @@ func ValidateAndExecuteDirectives(cdyfile Input, inst *Instance, justValidate bo
return err
}
- err = executeDirectives(inst, cdyfile.Path(), stype.Directives(), sblocks, justValidate)
- if err != nil {
- return err
- }
-
- return nil
+ return executeDirectives(inst, cdyfile.Path(), stype.Directives(), sblocks, justValidate)
}
func executeDirectives(inst *Instance, filename string,
diff --git a/sigtrap_posix.go b/sigtrap_posix.go
index 0715b3280..71b6969af 100644
--- a/sigtrap_posix.go
+++ b/sigtrap_posix.go
@@ -84,7 +84,7 @@ func trapSignalsPosix() {
}
// Kick off the restart; our work is done
- inst, err = inst.Restart(caddyfileToUse)
+ _, err = inst.Restart(caddyfileToUse)
if err != nil {
log.Printf("[ERROR] SIGUSR1: %v", err)
}
diff --git a/upgrade.go b/upgrade.go
index 9a607ef21..5e9f15589 100644
--- a/upgrade.go
+++ b/upgrade.go
@@ -148,7 +148,7 @@ func Upgrade() error {
// determine whether child startup succeeded
answer, readErr := ioutil.ReadAll(sigrpipe)
- if answer == nil || len(answer) == 0 {
+ if len(answer) == 0 {
cmdErr := cmd.Wait() // get exit status
errStr := fmt.Sprintf("child failed to initialize: %v", cmdErr)
if readErr != nil {