diff --git a/agent/pkg/handler/check_health.go b/agent/pkg/handler/check_health.go index d511e7de..848167b5 100644 --- a/agent/pkg/handler/check_health.go +++ b/agent/pkg/handler/check_health.go @@ -9,8 +9,8 @@ import ( "time" "github.com/bytedance/sonic" + healthcheck "github.com/yusing/godoxy/internal/health/check" "github.com/yusing/godoxy/internal/types" - healthcheck "github.com/yusing/godoxy/internal/watcher/health/check" ) func CheckHealth(w http.ResponseWriter, r *http.Request) { diff --git a/internal/autocert/setup_test.go b/internal/autocert/setup_test.go index 335c2e57..39cb12fb 100644 --- a/internal/autocert/setup_test.go +++ b/internal/autocert/setup_test.go @@ -50,16 +50,16 @@ extra: require.Equal(t, "certs/extra.crt", merged0.CertPath) require.Equal(t, "certs/extra.key", merged0.KeyPath) // Inherited fields from main config: - require.Equal(t, "test@example.com", merged0.Email) // inherited - require.Equal(t, "custom", merged0.Provider) // inherited - require.Equal(t, []string{"example.com"}, merged0.Domains) // inherited + require.Equal(t, "test@example.com", merged0.Email) // inherited + require.Equal(t, "custom", merged0.Provider) // inherited + require.Equal(t, []string{"example.com"}, merged0.Domains) // inherited require.Equal(t, "https://ca.example.com:9000/acme/acme/directory", merged0.CADirURL) // inherited - require.Equal(t, map[string]strutils.Redacted{"key": "value"}, merged0.Options) // inherited - require.Equal(t, []string{"8.8.8.8"}, merged0.Resolvers) // inherited - require.Equal(t, []string{"ca.crt"}, merged0.CACerts) // inherited - require.Equal(t, "eabKid", merged0.EABKid) // inherited - require.Equal(t, "eabHmac", merged0.EABHmac) // inherited - require.Equal(t, cfg.HTTPClient, merged0.HTTPClient) // inherited + require.Equal(t, map[string]strutils.Redacted{"key": "value"}, merged0.Options) // inherited + require.Equal(t, []string{"8.8.8.8"}, merged0.Resolvers) // inherited + require.Equal(t, []string{"ca.crt"}, merged0.CACerts) // inherited + require.Equal(t, "eabKid", merged0.EABKid) // inherited + require.Equal(t, "eabHmac", merged0.EABHmac) // inherited + require.Equal(t, cfg.HTTPClient, merged0.HTTPClient) // inherited require.Nil(t, merged0.Extra) // Test: extra[1] overrides some fields, and inherits others. diff --git a/internal/watcher/health/check/docker.go b/internal/health/check/docker.go similarity index 100% rename from internal/watcher/health/check/docker.go rename to internal/health/check/docker.go diff --git a/internal/watcher/health/check/fileserver.go b/internal/health/check/fileserver.go similarity index 100% rename from internal/watcher/health/check/fileserver.go rename to internal/health/check/fileserver.go diff --git a/internal/watcher/health/check/http.go b/internal/health/check/http.go similarity index 100% rename from internal/watcher/health/check/http.go rename to internal/health/check/http.go diff --git a/internal/watcher/health/check/stream.go b/internal/health/check/stream.go similarity index 100% rename from internal/watcher/health/check/stream.go rename to internal/health/check/stream.go diff --git a/internal/watcher/health/monitor/last_seen.go b/internal/health/monitor/last_seen.go similarity index 100% rename from internal/watcher/health/monitor/last_seen.go rename to internal/health/monitor/last_seen.go diff --git a/internal/watcher/health/monitor/monitor.go b/internal/health/monitor/monitor.go similarity index 100% rename from internal/watcher/health/monitor/monitor.go rename to internal/health/monitor/monitor.go diff --git a/internal/watcher/health/monitor/monitor_test.go b/internal/health/monitor/monitor_test.go similarity index 100% rename from internal/watcher/health/monitor/monitor_test.go rename to internal/health/monitor/monitor_test.go diff --git a/internal/watcher/health/monitor/new.go b/internal/health/monitor/new.go similarity index 97% rename from internal/watcher/health/monitor/new.go rename to internal/health/monitor/new.go index 9715cbf8..3344c40a 100644 --- a/internal/watcher/health/monitor/new.go +++ b/internal/health/monitor/new.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog/log" "github.com/yusing/godoxy/internal/agentpool" "github.com/yusing/godoxy/internal/docker" + healthcheck "github.com/yusing/godoxy/internal/health/check" "github.com/yusing/godoxy/internal/types" - healthcheck "github.com/yusing/godoxy/internal/watcher/health/check" ) type Result = types.HealthCheckResult diff --git a/internal/idlewatcher/watcher.go b/internal/idlewatcher/watcher.go index de19e3fe..2515806c 100644 --- a/internal/idlewatcher/watcher.go +++ b/internal/idlewatcher/watcher.go @@ -14,13 +14,13 @@ import ( "github.com/yusing/ds/ordered" config "github.com/yusing/godoxy/internal/config/types" "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/health/monitor" "github.com/yusing/godoxy/internal/idlewatcher/provider" idlewatcher "github.com/yusing/godoxy/internal/idlewatcher/types" nettypes "github.com/yusing/godoxy/internal/net/types" "github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/types" "github.com/yusing/godoxy/internal/watcher/events" - "github.com/yusing/godoxy/internal/watcher/health/monitor" gperr "github.com/yusing/goutils/errs" "github.com/yusing/goutils/http/reverseproxy" strutils "github.com/yusing/goutils/strings" diff --git a/internal/route/fileserver.go b/internal/route/fileserver.go index b6a97aea..b7b2f4ab 100644 --- a/internal/route/fileserver.go +++ b/internal/route/fileserver.go @@ -7,12 +7,12 @@ import ( "path/filepath" config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/health/monitor" "github.com/yusing/godoxy/internal/logging/accesslog" gphttp "github.com/yusing/godoxy/internal/net/gphttp" "github.com/yusing/godoxy/internal/net/gphttp/middleware" "github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/types" - "github.com/yusing/godoxy/internal/watcher/health/monitor" gperr "github.com/yusing/goutils/errs" "github.com/yusing/goutils/task" ) diff --git a/internal/route/reverse_proxy.go b/internal/route/reverse_proxy.go index 4bc37866..08225aa5 100755 --- a/internal/route/reverse_proxy.go +++ b/internal/route/reverse_proxy.go @@ -7,6 +7,7 @@ import ( "github.com/yusing/godoxy/agent/pkg/agent" "github.com/yusing/godoxy/agent/pkg/agentproxy" config "github.com/yusing/godoxy/internal/config/types" + "github.com/yusing/godoxy/internal/health/monitor" "github.com/yusing/godoxy/internal/idlewatcher" "github.com/yusing/godoxy/internal/logging/accesslog" gphttp "github.com/yusing/godoxy/internal/net/gphttp" @@ -16,7 +17,6 @@ import ( "github.com/yusing/godoxy/internal/route/routes" route "github.com/yusing/godoxy/internal/route/types" "github.com/yusing/godoxy/internal/types" - "github.com/yusing/godoxy/internal/watcher/health/monitor" gperr "github.com/yusing/goutils/errs" "github.com/yusing/goutils/http/reverseproxy" "github.com/yusing/goutils/task" diff --git a/internal/route/route.go b/internal/route/route.go index 3d48f4e6..52f93301 100644 --- a/internal/route/route.go +++ b/internal/route/route.go @@ -18,6 +18,7 @@ import ( "github.com/yusing/godoxy/internal/agentpool" config "github.com/yusing/godoxy/internal/config/types" "github.com/yusing/godoxy/internal/docker" + "github.com/yusing/godoxy/internal/health/monitor" "github.com/yusing/godoxy/internal/homepage" homepagecfg "github.com/yusing/godoxy/internal/homepage/types" netutils "github.com/yusing/godoxy/internal/net" @@ -25,7 +26,6 @@ import ( "github.com/yusing/godoxy/internal/proxmox" "github.com/yusing/godoxy/internal/serialization" "github.com/yusing/godoxy/internal/types" - "github.com/yusing/godoxy/internal/watcher/health/monitor" gperr "github.com/yusing/goutils/errs" strutils "github.com/yusing/goutils/strings" "github.com/yusing/goutils/task" diff --git a/internal/route/stream.go b/internal/route/stream.go index 544780db..e3329740 100755 --- a/internal/route/stream.go +++ b/internal/route/stream.go @@ -8,12 +8,12 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "github.com/yusing/godoxy/internal/health/monitor" "github.com/yusing/godoxy/internal/idlewatcher" nettypes "github.com/yusing/godoxy/internal/net/types" "github.com/yusing/godoxy/internal/route/routes" "github.com/yusing/godoxy/internal/route/stream" "github.com/yusing/godoxy/internal/types" - "github.com/yusing/godoxy/internal/watcher/health/monitor" gperr "github.com/yusing/goutils/errs" "github.com/yusing/goutils/task" )