From 6e686a85bfcc1dbcf5d79ac612c0a733c8230ae7 Mon Sep 17 00:00:00 2001
From: Valery Piashchynski <piashchynski.valery@gmail.com>
Date: Tue, 25 Jun 2024 17:56:07 +0200
Subject: [PATCH] chore: fix linters warnings

Signed-off-by: Valery Piashchynski <piashchynski.valery@gmail.com>
---
 .github/workflows/linters.yml        |  4 ++--
 .github/workflows/linux_inmemory.yml |  6 +++---
 .github/workflows/linux_jobs.yml     |  6 +++---
 .golangci.yml                        | 14 +++-----------
 memoryjobs/item.go                   |  1 +
 memorykv/kv.go                       |  2 +-
 6 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml
index 0b545d8..40011f3 100644
--- a/.github/workflows/linters.yml
+++ b/.github/workflows/linters.yml
@@ -18,6 +18,6 @@ jobs:
       - name: Run linter
         uses: golangci/golangci-lint-action@v6.0.1 # Action page: <https://github.com/golangci/golangci-lint-action>
         with:
-          version: v1.54 # without patch version
+          version: v1.59 # without patch version
           only-new-issues: false # show only new issues if it's a pull request
-          args: --timeout=10m --build-tags=race ./...
\ No newline at end of file
+          args: --timeout=10m --build-tags=race ./...
diff --git a/.github/workflows/linux_inmemory.yml b/.github/workflows/linux_inmemory.yml
index 7de811e..6c7a700 100644
--- a/.github/workflows/linux_inmemory.yml
+++ b/.github/workflows/linux_inmemory.yml
@@ -17,9 +17,9 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        php: [ "8.2" ]
-        go: [ stable ]
-        os: [ "ubuntu-latest" ]
+        php: ["8.3"]
+        go: [stable]
+        os: ["ubuntu-latest"]
     steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v5 # action page: <https://github.com/actions/setup-go>
diff --git a/.github/workflows/linux_jobs.yml b/.github/workflows/linux_jobs.yml
index 4a657ab..3bc3f0e 100644
--- a/.github/workflows/linux_jobs.yml
+++ b/.github/workflows/linux_jobs.yml
@@ -17,9 +17,9 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        php: [ "8.2" ]
-        go: [ stable ]
-        os: [ "ubuntu-latest" ]
+        php: ["8.3"]
+        go: [stable]
+        os: ["ubuntu-latest"]
     steps:
       - name: Set up Go ${{ matrix.go }}
         uses: actions/setup-go@v5 # action page: <https://github.com/actions/setup-go>
diff --git a/.golangci.yml b/.golangci.yml
index 33a23a8..8f252db 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -2,21 +2,11 @@
 
 run:
   timeout: 1m
-  skip-dirs:
-    - .github
-    - .git
   allow-parallel-runners: true
 
-output:
-  format: colored-line-number # colored-line-number|line-number|json|tab|checkstyle|code-climate
-
 linters-settings:
   wsl:
     allow-assign-and-anything: true
-  govet:
-    check-shadowing: true
-  golint:
-    min-confidence: 0.1
   gocyclo:
     min-complexity: 15
   godot:
@@ -36,7 +26,6 @@ linters-settings:
     range-loops: true
     for-loops: true
   nolintlint:
-    allow-leading-space: false
     require-specific: true
 
 linters: # All available linters list: <https://golangci-lint.run/usage/linters/>
@@ -76,6 +65,9 @@ linters: # All available linters list: <https://golangci-lint.run/usage/linters/
     - whitespace # Tool for detection of leading and trailing whitespace
 
 issues:
+  exclude-dirs:
+    - .github
+    - .git
   exclude-rules:
     - path: _test\.go
       linters:
diff --git a/memoryjobs/item.go b/memoryjobs/item.go
index 6379b9c..f0f8963 100644
--- a/memoryjobs/item.go
+++ b/memoryjobs/item.go
@@ -114,6 +114,7 @@ func (i *Item) NackWithOptions(redeliver bool, delay int) error {
 	}
 
 	if redeliver {
+		i.Options.Delay = delay
 		err := i.Options.requeueFn(context.Background(), i)
 		if err != nil {
 			return err
diff --git a/memorykv/kv.go b/memorykv/kv.go
index 302183a..06df07f 100644
--- a/memorykv/kv.go
+++ b/memorykv/kv.go
@@ -343,7 +343,7 @@ func (d *Driver) Clear() error {
 	newCh := make(chan struct{})
 	d.broadcastStopCh.Swap(&newCh)
 
-	d.heap.Range(func(key any, value any) bool {
+	d.heap.Range(func(key any, _ any) bool {
 		d.heap.Delete(key)
 		return true
 	})