diff --git a/internal/docker/idlewatcher/container.go b/internal/idlewatcher/container.go similarity index 100% rename from internal/docker/idlewatcher/container.go rename to internal/idlewatcher/container.go diff --git a/internal/docker/idlewatcher/html/loading_page.html b/internal/idlewatcher/html/loading_page.html similarity index 100% rename from internal/docker/idlewatcher/html/loading_page.html rename to internal/idlewatcher/html/loading_page.html diff --git a/internal/docker/idlewatcher/loading_page.go b/internal/idlewatcher/loading_page.go similarity index 100% rename from internal/docker/idlewatcher/loading_page.go rename to internal/idlewatcher/loading_page.go diff --git a/internal/docker/idlewatcher/state.go b/internal/idlewatcher/state.go similarity index 100% rename from internal/docker/idlewatcher/state.go rename to internal/idlewatcher/state.go diff --git a/internal/docker/idlewatcher/types/config.go b/internal/idlewatcher/types/config.go similarity index 99% rename from internal/docker/idlewatcher/types/config.go rename to internal/idlewatcher/types/config.go index 829b54fe..d53c3a1a 100644 --- a/internal/docker/idlewatcher/types/config.go +++ b/internal/idlewatcher/types/config.go @@ -1,4 +1,4 @@ -package types +package idlewatcher import ( "errors" diff --git a/internal/docker/idlewatcher/types/config_test.go b/internal/idlewatcher/types/config_test.go similarity index 97% rename from internal/docker/idlewatcher/types/config_test.go rename to internal/idlewatcher/types/config_test.go index 730c0c70..8ec4315c 100644 --- a/internal/docker/idlewatcher/types/config_test.go +++ b/internal/idlewatcher/types/config_test.go @@ -1,4 +1,4 @@ -package types +package idlewatcher import ( "testing" diff --git a/internal/docker/idlewatcher/types/waker.go b/internal/idlewatcher/types/waker.go similarity index 91% rename from internal/docker/idlewatcher/types/waker.go rename to internal/idlewatcher/types/waker.go index 00488518..b06d5e19 100644 --- a/internal/docker/idlewatcher/types/waker.go +++ b/internal/idlewatcher/types/waker.go @@ -1,4 +1,4 @@ -package types +package idlewatcher import ( "net/http" diff --git a/internal/docker/idlewatcher/waker.go b/internal/idlewatcher/waker.go similarity index 97% rename from internal/docker/idlewatcher/waker.go rename to internal/idlewatcher/waker.go index ccda00e7..0571f664 100644 --- a/internal/docker/idlewatcher/waker.go +++ b/internal/idlewatcher/waker.go @@ -3,8 +3,8 @@ package idlewatcher import ( "time" - "github.com/yusing/go-proxy/internal/docker/idlewatcher/types" "github.com/yusing/go-proxy/internal/gperr" + idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" "github.com/yusing/go-proxy/internal/metrics" "github.com/yusing/go-proxy/internal/net/gphttp/reverseproxy" net "github.com/yusing/go-proxy/internal/net/types" @@ -16,7 +16,7 @@ import ( ) type ( - Waker = types.Waker + Waker = idlewatcher.Waker waker struct { _ U.NoCopy diff --git a/internal/docker/idlewatcher/waker_http.go b/internal/idlewatcher/waker_http.go similarity index 100% rename from internal/docker/idlewatcher/waker_http.go rename to internal/idlewatcher/waker_http.go diff --git a/internal/docker/idlewatcher/waker_stream.go b/internal/idlewatcher/waker_stream.go similarity index 100% rename from internal/docker/idlewatcher/waker_stream.go rename to internal/idlewatcher/waker_stream.go diff --git a/internal/docker/idlewatcher/watcher.go b/internal/idlewatcher/watcher.go similarity index 98% rename from internal/docker/idlewatcher/watcher.go rename to internal/idlewatcher/watcher.go index a504153a..f46919ed 100644 --- a/internal/docker/idlewatcher/watcher.go +++ b/internal/idlewatcher/watcher.go @@ -8,8 +8,8 @@ import ( "github.com/rs/zerolog" "github.com/yusing/go-proxy/internal/docker" - idlewatcher "github.com/yusing/go-proxy/internal/docker/idlewatcher/types" "github.com/yusing/go-proxy/internal/gperr" + idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" "github.com/yusing/go-proxy/internal/logging" route "github.com/yusing/go-proxy/internal/route/types" "github.com/yusing/go-proxy/internal/task" diff --git a/internal/net/gphttp/loadbalancer/types/server.go b/internal/net/gphttp/loadbalancer/types/server.go index 15abc0ae..59dee05c 100644 --- a/internal/net/gphttp/loadbalancer/types/server.go +++ b/internal/net/gphttp/loadbalancer/types/server.go @@ -3,7 +3,7 @@ package types import ( "net/http" - idlewatcher "github.com/yusing/go-proxy/internal/docker/idlewatcher/types" + idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" net "github.com/yusing/go-proxy/internal/net/types" U "github.com/yusing/go-proxy/internal/utils" F "github.com/yusing/go-proxy/internal/utils/functional" diff --git a/internal/route/reverse_proxy.go b/internal/route/reverse_proxy.go index ee1e1ae5..5cf9c4cf 100755 --- a/internal/route/reverse_proxy.go +++ b/internal/route/reverse_proxy.go @@ -9,8 +9,8 @@ import ( "github.com/yusing/go-proxy/internal/api/v1/favicon" "github.com/yusing/go-proxy/internal/common" "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/docker/idlewatcher" "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/go-proxy/internal/idlewatcher" "github.com/yusing/go-proxy/internal/logging" gphttp "github.com/yusing/go-proxy/internal/net/gphttp" "github.com/yusing/go-proxy/internal/net/gphttp/accesslog" diff --git a/internal/route/route.go b/internal/route/route.go index 43cfa9d7..34414881 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -8,9 +8,9 @@ import ( "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal" "github.com/yusing/go-proxy/internal/docker" - idlewatcher "github.com/yusing/go-proxy/internal/docker/idlewatcher/types" "github.com/yusing/go-proxy/internal/gperr" "github.com/yusing/go-proxy/internal/homepage" + idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" net "github.com/yusing/go-proxy/internal/net/types" "github.com/yusing/go-proxy/internal/task" "github.com/yusing/go-proxy/internal/utils/strutils" diff --git a/internal/route/stream.go b/internal/route/stream.go index 259e9baa..02e73342 100755 --- a/internal/route/stream.go +++ b/internal/route/stream.go @@ -6,8 +6,8 @@ import ( "github.com/rs/zerolog" "github.com/yusing/go-proxy/internal/docker" - "github.com/yusing/go-proxy/internal/docker/idlewatcher" "github.com/yusing/go-proxy/internal/gperr" + "github.com/yusing/go-proxy/internal/idlewatcher" "github.com/yusing/go-proxy/internal/logging" net "github.com/yusing/go-proxy/internal/net/types" "github.com/yusing/go-proxy/internal/route/routes" diff --git a/internal/route/types/route.go b/internal/route/types/route.go index 3011e03a..299eac63 100644 --- a/internal/route/types/route.go +++ b/internal/route/types/route.go @@ -5,8 +5,8 @@ import ( "github.com/yusing/go-proxy/agent/pkg/agent" "github.com/yusing/go-proxy/internal/docker" - idlewatcher "github.com/yusing/go-proxy/internal/docker/idlewatcher/types" "github.com/yusing/go-proxy/internal/homepage" + idlewatcher "github.com/yusing/go-proxy/internal/idlewatcher/types" net "github.com/yusing/go-proxy/internal/net/types" "github.com/yusing/go-proxy/internal/task" "github.com/yusing/go-proxy/internal/watcher/health"