From dff23a14e6d9dfe46bd1a1e77f2f2ee7ab34afb3 Mon Sep 17 00:00:00 2001
From: Garet Halliday <me@garet.holiday>
Date: Tue, 14 Nov 2023 19:33:13 -0600
Subject: [PATCH] remove hardcoded
---
lib/gat/handlers/pool/pools/basic/config.go | 8 --------
lib/gat/handlers/pool/pools/hybrid/config.go | 9 ---------
lib/gat/standard/standard.go | 3 +++
3 files changed, 3 insertions(+), 17 deletions(-)
diff --git a/lib/gat/handlers/pool/pools/basic/config.go b/lib/gat/handlers/pool/pools/basic/config.go
index 0f2fffe4..626257a3 100644
--- a/lib/gat/handlers/pool/pools/basic/config.go
+++ b/lib/gat/handlers/pool/pools/basic/config.go
@@ -8,8 +8,6 @@ import (
"github.com/caddyserver/caddy/v2/caddyconfig"
"go.uber.org/zap"
- "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/critics/latency"
-
"gfx.cafe/gfx/pggat/lib/gat/handlers/pool"
"gfx.cafe/gfx/pggat/lib/gat/handlers/pool/poolers/lifo"
"gfx.cafe/gfx/pggat/lib/gat/handlers/pool/poolers/rob"
@@ -77,12 +75,6 @@ func (T Config) Spool() spool.Config {
ReconnectInitialTime: time.Duration(T.ServerReconnectInitialTime),
ReconnectMaxTime: time.Duration(T.ServerReconnectMaxTime),
- Critics: []pool.Critic{
- &latency.Critic{
- Threshold: caddy.Duration(200 * time.Millisecond),
- },
- },
-
Logger: T.Logger,
}
}
diff --git a/lib/gat/handlers/pool/pools/hybrid/config.go b/lib/gat/handlers/pool/pools/hybrid/config.go
index d12a48ac..4253c626 100644
--- a/lib/gat/handlers/pool/pools/hybrid/config.go
+++ b/lib/gat/handlers/pool/pools/hybrid/config.go
@@ -6,9 +6,6 @@ import (
"github.com/caddyserver/caddy/v2"
"go.uber.org/zap"
- "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/critics/latency"
-
- "gfx.cafe/gfx/pggat/lib/gat/handlers/pool"
"gfx.cafe/gfx/pggat/lib/gat/handlers/pool/poolers/rob"
"gfx.cafe/gfx/pggat/lib/gat/handlers/pool/spool"
"gfx.cafe/gfx/pggat/lib/util/strutil"
@@ -34,12 +31,6 @@ func (T Config) Spool() spool.Config {
ReconnectInitialTime: time.Duration(T.ServerReconnectInitialTime),
ReconnectMaxTime: time.Duration(T.ServerReconnectMaxTime),
- Critics: []pool.Critic{
- &latency.Critic{
- Threshold: caddy.Duration(200 * time.Millisecond),
- },
- },
-
Logger: T.Logger,
}
}
diff --git a/lib/gat/standard/standard.go b/lib/gat/standard/standard.go
index deb2deb9..be606cfc 100644
--- a/lib/gat/standard/standard.go
+++ b/lib/gat/standard/standard.go
@@ -41,6 +41,9 @@ import (
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/poolers/lifo"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/poolers/rob"
+ // critics
+ _ "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/critics/latency"
+
// pools
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/pools/basic"
_ "gfx.cafe/gfx/pggat/lib/gat/handlers/pool/pools/hybrid"
--
GitLab