switch to gofumpt

pull/11/head
Jeffrey Paul 2 years ago
parent 3da597f4ba
commit 2b428230b2
  1. 6
      Makefile
  2. 8
      cmd/httpd/main.go
  3. 9
      httpserver/main.go
  4. 3
      httpserver/middlewares.go
  5. 2
      httpserver/routes.go

@ -14,12 +14,12 @@ default: debug
commit: fmt lint
git commit -a
# get goimports with:
# go get golang.org/x/tools/cmd/goimports
# get golangci-lint with:
# go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.31.0
# get gofumports with:
# go get mvdan.cc/gofumpt/gofumports
fmt:
goimports -l -w .
gofumports -l -w .
golangci-lint run --fix
lint:

@ -6,9 +6,11 @@ import (
"git.eeqj.de/sneak/gohttpserver/httpserver"
)
var Appname string = "CHANGEME"
var Version string
var Buildarch string
var (
Appname string = "CHANGEME"
Version string
Buildarch string
)
func main() {
os.Exit(httpserver.Run(Appname, Version, Buildarch))

@ -122,12 +122,11 @@ func (s *server) serve() int {
go s.serveUntilShutdown()
for range s.ctx.Done() {
//aforementioned clean shutdown upon main context
//cancellation
// aforementioned clean shutdown upon main context
// cancellation
}
s.cleanShutdown()
return s.exitCode
}
func (s *server) cleanupForExit() {
@ -171,7 +170,7 @@ func (s *server) configure() {
viper.AddConfigPath(fmt.Sprintf("/etc/%s", s.appname))
// call multiple times to add many search paths:
viper.AddConfigPath(fmt.Sprintf("$HOME/.config/%s", s.appname))
//viper.SetEnvPrefix(strings.ToUpper(s.appname))
// viper.SetEnvPrefix(strings.ToUpper(s.appname))
viper.AutomaticEnv()
viper.SetDefault("DEBUG", "false")
@ -250,7 +249,7 @@ func (s *server) setupLogging() {
logger := zerolog.New(multi).With().Timestamp().Logger().With().Caller().Logger()
s.log = &logger
//log.Logger = logger
// log.Logger = logger
if viper.GetBool("debug") {
zerolog.SetGlobalLevel(zerolog.DebugLevel)

@ -66,11 +66,9 @@ func (s *server) LoggingMiddleware() func(http.Handler) http.Handler {
Int("status", lrw.statusCode).
Int("latency_ms", int(latency.Milliseconds())).
Send()
}()
next.ServeHTTP(lrw, r)
})
}
}
@ -118,5 +116,4 @@ func (s *server) MetricsAuthMiddleware() func(http.Handler) http.Handler {
},
},
)
}

@ -12,7 +12,6 @@ import (
)
func (s *server) routes() {
s.router = chi.NewRouter()
// the mux .Use() takes a http.Handler wrapper func, like most
@ -93,5 +92,4 @@ func (s *server) routes() {
r.Get("/metrics", http.HandlerFunc(promhttp.Handler().ServeHTTP))
})
}
}

Loading…
Cancel
Save