lint updates

golift · Sep 20, 2023 · 6d5d0cc · 6d5d0cc
1 parent 3968da6
commit 6d5d0cc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/codetests.yml b/.github/workflows/codetests.yml
@@ -13,7 +13,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: go-test
         run: |
           go test ./...
@@ -40,8 +40,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.21'
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: 'v1.52'
+          version: 'v1.53'
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -5,6 +5,8 @@ on:
     branches: [ "main" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*' ]
+  pull_request:
+    branches: [ "main" ]
 
 env:
   # Use docker.io for Docker Hub if empty

diff --git a/.golangci.yml b/.golangci.yml
@@ -16,6 +16,8 @@ linters:
     - exhaustruct
     - exhaustive
     - nlreturn
+    - tagalign
+    - depguard
 
 run:
   timeout: 5m
diff --git a/mulery.go b/mulery.go
@@ -108,8 +108,8 @@ func (c *Config) Start() {
 	apache, _ := apachelog.New(c.ApacheLogFormat())
 
 	smx.Handle("/metrics", apache.Wrap(c.ValidateUpstream(promhttp.Handler()), c.httpLog.Writer()))
+	smx.Handle("/register", c.dispatch.HandleRegister()) // apache log can't do websockets.
 	smx.Handle("/stats", apache.Wrap(c.ValidateUpstream(http.HandlerFunc(c.dispatch.HandleStats)), c.httpLog.Writer()))
-	smx.Handle("/register", c.dispatch.HandleRegister())                                   // apache log can't do websockets.
 	smx.Handle("/request", apache.Wrap(http.HandlerFunc(c.HandleAll), c.httpLog.Writer())) // handleAll
 	smx.Handle("/request/", apache.Wrap(http.StripPrefix("/request",
 		c.ValidateUpstream(c.parsePath())), c.httpLog.Writer()))