sneak/gohttpserver
1
0
Fork 0
Code Issues 5 Pull Requests 1 Releases Wiki Activity

Merge branch 'add-fumpt' of sneak/gohttpserver into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Jeffrey Paul 2020-10-10 15:13:10 +00:00 committed by Gitea
commit 3eec2b8d1d
5 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

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

8
cmd/httpd/main.go
View File

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

9
httpserver/main.go
View File

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

3
httpserver/middlewares.go
View File

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

2
httpserver/routes.go
View File

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