fix: misc (#82)

kunitsucom · Aug 24, 2023 · d4ce3f1 · d4ce3f1
2 parents 05589b7 + 6d550af
commit d4ce3f1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 16 deletions.
diff --git a/net/http/realip_test.go b/net/http/realip_test.go
@@ -3,12 +3,10 @@ package httpz_test
 import (
 	"bytes"
 	"context"
-	"net"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 
-	netz "github.com/kunitsucom/util.go/net"
 	httpz "github.com/kunitsucom/util.go/net/http"
 )
 
@@ -36,7 +34,7 @@ func TestNewXRealIPHandler(t *testing.T) {
 		actualResponse := &httptest.ResponseRecorder{}
 
 		middleware := httpz.NewXRealIPHandler(
-			[]*net.IPNet{netz.PrivateIPAddressClassA},
+			httpz.DefaultSetRealIPFrom(),
 			httpz.HeaderXForwardedFor,
 			true,
 			httpz.WithClientIPAddressHeader(header),
@@ -71,7 +69,7 @@ func TestNewXRealIPHandler(t *testing.T) {
 		actualResponse := &httptest.ResponseRecorder{}
 
 		middleware := httpz.NewXRealIPHandler(
-			[]*net.IPNet{netz.PrivateIPAddressClassA},
+			httpz.DefaultSetRealIPFrom(),
 			testHeaderKey,
 			true,
 		)
@@ -103,7 +101,7 @@ func TestNewXRealIPHandler(t *testing.T) {
 		actualResponse := &httptest.ResponseRecorder{}
 
 		middleware := httpz.NewXRealIPHandler(
-			[]*net.IPNet{netz.PrivateIPAddressClassA},
+			httpz.DefaultSetRealIPFrom(),
 			httpz.HeaderXForwardedFor,
 			true,
 		)
@@ -135,7 +133,7 @@ func TestNewXRealIPHandler(t *testing.T) {
 		actualResponse := &httptest.ResponseRecorder{}
 
 		middleware := httpz.NewXRealIPHandler(
-			[]*net.IPNet{netz.PrivateIPAddressClassA},
+			httpz.DefaultSetRealIPFrom(),
 			httpz.HeaderXForwardedFor,
 			false,
 		)

diff --git a/time/time.go b/time/time.go
@@ -9,15 +9,16 @@ import (
 type ctxKeyNow struct{}
 
 func Now(ctx context.Context) time.Time {
-	nowFuncRWMu.RLock()
-	defer nowFuncRWMu.RUnlock()
-	return nowFunc(ctx)
+	_nowFuncRWMu.RLock()
+	t := _nowFunc(ctx)
+	_nowFuncRWMu.RUnlock()
+	return t
 }
 
 //nolint:gochecknoglobals
 var (
-	nowFunc     = DefaultNowFunc
-	nowFuncRWMu sync.RWMutex
+	_nowFunc     NowFunc = DefaultNowFunc //nolint:revive
+	_nowFuncRWMu sync.RWMutex
 )
 
 type NowFunc = func(ctx context.Context) time.Time
@@ -30,11 +31,11 @@ func DefaultNowFunc(ctx context.Context) time.Time {
 	return time.Now()
 }
 
-func SetNowFunc(now NowFunc) (backup NowFunc) {
-	nowFuncRWMu.Lock()
-	defer nowFuncRWMu.Unlock()
-	backup = nowFunc
-	nowFunc = now
+func SetNowFunc(nowFunc NowFunc) (backup NowFunc) {
+	_nowFuncRWMu.Lock()
+	backup = _nowFunc
+	_nowFunc = nowFunc
+	_nowFuncRWMu.Unlock()
 	return backup
 }