summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDave Henderson <dhenderson@gmail.com>2020-11-22 16:50:29 -0500
committerGitHub <noreply@github.com>2020-11-22 14:50:29 -0700
commitbd17eb205d6ac464c64eb888a6f4b57445b6c59c (patch)
tree5ba6a1284b72f9f3ac5323a0f1fc14795a4b40f8 /cmd
parent1e480b818b56b5c46b88d59f54e0b5e54e7758f8 (diff)
ci: Use golangci's github action for linting (#3794)
* ci: Use golangci's github action for linting Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix most of the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the prealloc lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the misspell lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the varcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the errcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the bodyclose lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the deadcode lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the unused lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosec lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the gosimple lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the ineffassign lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Fix the staticcheck lint errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert the misspell change, use a neutral English Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove broken golangci-lint CI job Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Re-add errantly-removed weakrand initialization Signed-off-by: Dave Henderson <dhenderson@gmail.com> * don't break the loop and return * Removing extra handling for null rootKey * unignore RegisterModule/RegisterAdapter Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> * single-line log message Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Fix lint after a1808b0dbf209c615e438a496d257ce5e3acdce2 was merged Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Revert ticker change, ignore it instead Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Ignore some of the write errors Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Remove blank line Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Use lifetime Signed-off-by: Dave Henderson <dhenderson@gmail.com> * close immediately Co-authored-by: Matt Holt <mholt@users.noreply.github.com> * Preallocate configVals Signed-off-by: Dave Henderson <dhenderson@gmail.com> * Update modules/caddytls/distributedstek/distributedstek.go Co-authored-by: Mohammed Al Sahaf <msaa1990@gmail.com> Co-authored-by: Matt Holt <mholt@users.noreply.github.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/commandfuncs.go2
-rw-r--r--cmd/main.go1
-rw-r--r--cmd/proc_posix.go37
-rw-r--r--cmd/proc_windows.go44
4 files changed, 2 insertions, 82 deletions
diff --git a/cmd/commandfuncs.go b/cmd/commandfuncs.go
index 772fe01..28fa26e 100644
--- a/cmd/commandfuncs.go
+++ b/cmd/commandfuncs.go
@@ -96,7 +96,7 @@ func cmdStart(fl Flags) (int, error) {
// started yet, and writing synchronously would result
// in a deadlock
go func() {
- stdinpipe.Write(expect)
+ _, _ = stdinpipe.Write(expect)
stdinpipe.Close()
}()
diff --git a/cmd/main.go b/cmd/main.go
index 914df21..e92e71f 100644
--- a/cmd/main.go
+++ b/cmd/main.go
@@ -236,6 +236,7 @@ func watchConfigFile(filename, adapterName string) {
}
// begin poller
+ //nolint:staticcheck
for range time.Tick(1 * time.Second) {
// get the file info
info, err := os.Stat(filename)
diff --git a/cmd/proc_posix.go b/cmd/proc_posix.go
deleted file mode 100644
index 9ca589f..0000000
--- a/cmd/proc_posix.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !windows
-
-package caddycmd
-
-import (
- "fmt"
- "os"
- "path/filepath"
- "syscall"
-)
-
-func gracefullyStopProcess(pid int) error {
- fmt.Print("Graceful stop... ")
- err := syscall.Kill(pid, syscall.SIGINT)
- if err != nil {
- return fmt.Errorf("kill: %v", err)
- }
- return nil
-}
-
-func getProcessName() string {
- return filepath.Base(os.Args[0])
-}
diff --git a/cmd/proc_windows.go b/cmd/proc_windows.go
deleted file mode 100644
index 4a62c27..0000000
--- a/cmd/proc_windows.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2015 Matthew Holt and The Caddy Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package caddycmd
-
-import (
- "fmt"
- "os"
- "os/exec"
- "path/filepath"
- "strconv"
-)
-
-func gracefullyStopProcess(pid int) error {
- fmt.Print("Forceful stop... ")
- // process on windows will not stop unless forced with /f
- cmd := exec.Command("taskkill", "/pid", strconv.Itoa(pid), "/f")
- if err := cmd.Run(); err != nil {
- return fmt.Errorf("taskkill: %v", err)
- }
- return nil
-}
-
-// On Windows the app name passed in os.Args[0] will match how
-// caddy was started eg will match caddy or caddy.exe.
-// So return appname with .exe for consistency
-func getProcessName() string {
- base := filepath.Base(os.Args[0])
- if filepath.Ext(base) == "" {
- return base + ".exe"
- }
- return base
-}