diff --git a/lib/gat/handlers/pool/pools/basic/config.go b/lib/gat/handlers/pool/pools/basic/config.go index 0f2fffe48836463f5eb6ab3a736f43b1db3b7260..626257a35b590b3279073aa8ff24f529832f30fc 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 d12a48acc2b900fa1371156b917bd8d2b176b93d..4253c6264e3f59b3358324193c11ccb98b0e67f7 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 deb2deb9b05db103bbeb7a04a12f3b5f7ee44aca..be606cfcbce1ff4f2b3e8d216a00fe2eb4d9a9f2 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"