limithandler: Reorder functions for better readability

The functions in the limithandler's middleware implementation are
seemingly ordered at random. Reorder them to group structures and their
receiver functions together. Furthermore, order constructors right after
their struct.

1 files changed, 30 insertions, 30 deletions

diff --git a/internal/middleware/limithandler/middleware.go b/internal/middleware/limithandler/middleware.go
index c276183a2..df228ce6f 100644
--- a/internal/middleware/limithandler/middleware.go
+++ b/internal/middleware/limithandler/middleware.go
@@ -7,6 +7,8 @@ import (
 	"google.golang.org/grpc"
 )
 
+var maxConcurrencyPerRepoPerRPC map[string]int
+
 // GetLockKey function defines the lock key of an RPC invocation based on its context
 type GetLockKey func(context.Context) string
 
@@ -16,15 +18,14 @@ type LimiterMiddleware struct {
 	getLockKey     GetLockKey
 }
 
-type wrappedStream struct {
-	grpc.ServerStream
-	info              *grpc.StreamServerInfo
-	limiterMiddleware *LimiterMiddleware
-	initial           bool
+// New creates a new rate limiter
+func New(getLockKey GetLockKey) LimiterMiddleware {
+	return LimiterMiddleware{
+		methodLimiters: createLimiterConfig(),
+		getLockKey:     getLockKey,
+	}
 }
 
-var maxConcurrencyPerRepoPerRPC map[string]int
-
 // UnaryInterceptor returns a Unary Interceptor
 func (c *LimiterMiddleware) UnaryInterceptor() grpc.UnaryServerInterceptor {
 	return func(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, handler grpc.UnaryHandler) (interface{}, error) {
@@ -53,6 +54,28 @@ func (c *LimiterMiddleware) StreamInterceptor() grpc.StreamServerInterceptor {
 	}
 }
 
+func createLimiterConfig() map[string]*ConcurrencyLimiter {
+	result := make(map[string]*ConcurrencyLimiter)
+
+	for fullMethodName, max := range maxConcurrencyPerRepoPerRPC {
+		result[fullMethodName] = NewLimiter(max, NewPromMonitor("gitaly", fullMethodName))
+	}
+
+	return result
+}
+
+// SetMaxRepoConcurrency Configures the max concurrency per repo per RPC
+func SetMaxRepoConcurrency(config map[string]int) {
+	maxConcurrencyPerRepoPerRPC = config
+}
+
+type wrappedStream struct {
+	grpc.ServerStream
+	info              *grpc.StreamServerInfo
+	limiterMiddleware *LimiterMiddleware
+	initial           bool
+}
+
 func (w *wrappedStream) RecvMsg(m interface{}) error {
 	if err := w.ServerStream.RecvMsg(m); err != nil {
 		return err
@@ -97,26 +120,3 @@ func (w *wrappedStream) RecvMsg(m interface{}) error {
 		return nil
 	}
 }
-
-// New creates a new rate limiter
-func New(getLockKey GetLockKey) LimiterMiddleware {
-	return LimiterMiddleware{
-		methodLimiters: createLimiterConfig(),
-		getLockKey:     getLockKey,
-	}
-}
-
-func createLimiterConfig() map[string]*ConcurrencyLimiter {
-	result := make(map[string]*ConcurrencyLimiter)
-
-	for fullMethodName, max := range maxConcurrencyPerRepoPerRPC {
-		result[fullMethodName] = NewLimiter(max, NewPromMonitor("gitaly", fullMethodName))
-	}
-
-	return result
-}
-
-// SetMaxRepoConcurrency Configures the max concurrency per repo per RPC
-func SetMaxRepoConcurrency(config map[string]int) {
-	maxConcurrencyPerRepoPerRPC = config
-}