From 81ba3096506c0afbbbde537e137e340579628ad0 Mon Sep 17 00:00:00 2001 From: ryan Date: Sun, 31 May 2026 20:05:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BC=98=E5=8C=96]=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openflare_agent/cmd/agent/main.go | 2 +- openflare_agent/internal/nginx/manager.go | 12 ++++++------ openflare_agent/internal/nginx/manager_test.go | 6 +++--- .../internal/nginx/observability_assets.go | 10 +++++----- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/openflare_agent/cmd/agent/main.go b/openflare_agent/cmd/agent/main.go index f7cfa3ba..290cd9aa 100644 --- a/openflare_agent/cmd/agent/main.go +++ b/openflare_agent/cmd/agent/main.go @@ -71,7 +71,7 @@ func main() { LuaDir: cfg.LuaDir, NginxLuaDir: cfg.OpenrestyLuaDir, RuntimeConfigDir: cfg.RuntimeConfigDir, - OpenrestyObservabilityListen: nginx.ObservabilityListenAddress(cfg.OpenrestyPath, cfg.OpenrestyObservabilityPort), + OpenrestyObservabilityListen: nginx.ObservabilityListenAddress(cfg.OpenrestyObservabilityPort), OpenrestyObservabilityPort: cfg.OpenrestyObservabilityPort, OpenrestyResolverDirective: "", Executor: nginx.NewExecutor(nginx.ExecutorOptions{ diff --git a/openflare_agent/internal/nginx/manager.go b/openflare_agent/internal/nginx/manager.go index 9acb95be..e5188667 100644 --- a/openflare_agent/internal/nginx/manager.go +++ b/openflare_agent/internal/nginx/manager.go @@ -102,7 +102,7 @@ func (e *PathExecutor) Reload(ctx context.Context) error { return nil } -func (e *PathExecutor) EnsureRuntime(ctx context.Context, recreate bool) error { +func (e *PathExecutor) EnsureRuntime(ctx context.Context, _ bool) error { if err := e.Test(ctx); err != nil { return err } @@ -479,7 +479,7 @@ func parseNginxVersion(output string) string { return matches[1] } -var nginxVersionPattern = regexp.MustCompile(`(?im)(?:nginx|openresty) version:\s*(?:nginx|openresty)/([^\s]+)`) +var nginxVersionPattern = regexp.MustCompile(`(?im)(?:nginx|openresty) version:\s*(?:nginx|openresty)/(\S+)`) func isIgnorableOpenrestyStopError(output string) bool { text := strings.ToLower(strings.TrimSpace(output)) @@ -1095,22 +1095,22 @@ func (m *Manager) managedWAFLuaFiles() []protocol.SupportFile { return files } -func ObservabilityListenAddress(openrestyPath string, port int) string { +func ObservabilityListenAddress(port int) string { if port <= 0 { return "" } return fmt.Sprintf("127.0.0.1:%d", port) } -func ResolverDirective(openrestyPath string, explicitResolvers []string) string { - resolvers := resolverAddresses(openrestyPath, explicitResolvers) +func ResolverDirective(explicitResolvers []string) string { + resolvers := resolverAddresses(explicitResolvers) if len(resolvers) == 0 { return "" } return fmt.Sprintf(" resolver %s valid=30s ipv6=off;\n resolver_timeout 5s;\n", strings.Join(resolvers, " ")) } -func resolverAddresses(openrestyPath string, explicitResolvers []string) []string { +func resolverAddresses(explicitResolvers []string) []string { if resolvers := utils.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 { return resolvers } diff --git a/openflare_agent/internal/nginx/manager_test.go b/openflare_agent/internal/nginx/manager_test.go index 4fe025ae..26520f61 100644 --- a/openflare_agent/internal/nginx/manager_test.go +++ b/openflare_agent/internal/nginx/manager_test.go @@ -392,7 +392,7 @@ func TestManagerCheckHealthFailsWhenStubStatusUnavailable(t *testing.T) { } func TestResolverDirectiveUsesExplicitResolvers(t *testing.T) { - got := ResolverDirective("", []string{"10.0.0.2", "1.1.1.1"}) + got := ResolverDirective([]string{"10.0.0.2", "1.1.1.1"}) if !strings.Contains(got, "resolver 10.0.0.2 1.1.1.1") { t.Fatalf("expected explicit resolver directive, got %q", got) } @@ -916,10 +916,10 @@ func TestManagerApplyRejectsCertFilePathTraversal(t *testing.T) { } func TestObservabilityListenAddress(t *testing.T) { - if got := ObservabilityListenAddress("", 18081); got != "127.0.0.1:18081" { + if got := ObservabilityListenAddress(18081); got != "127.0.0.1:18081" { t.Fatalf("unexpected default observability listen address: %s", got) } - if got := ObservabilityListenAddress("/usr/local/openresty/nginx/sbin/openresty", 18081); got != "127.0.0.1:18081" { + if got := ObservabilityListenAddress(18081); got != "127.0.0.1:18081" { t.Fatalf("unexpected path observability listen address: %s", got) } } diff --git a/openflare_agent/internal/nginx/observability_assets.go b/openflare_agent/internal/nginx/observability_assets.go index cd00283e..e830bba4 100644 --- a/openflare_agent/internal/nginx/observability_assets.go +++ b/openflare_agent/internal/nginx/observability_assets.go @@ -3,8 +3,8 @@ package nginx import "openflare-agent/internal/protocol" const ( - openRestyObservabilityWindowTTL = 7200 - openRestyObservabilityWindowSize = 60 + openRestyObservabilityWindowTTL = "7200" + openRestyObservabilityWindowSize = "60" ) const openRestyObservabilityInitLua = `local dict = ngx.shared.openflare_observability @@ -25,9 +25,9 @@ if request_uri == "/openflare/observability" or request_uri == "/openflare/stub_ return end -local ttl = ` + "7200" + ` +local ttl = ` + openRestyObservabilityWindowTTL + ` local now = ngx.time() -local window_size = ` + "60" + ` +local window_size = ` + openRestyObservabilityWindowSize + ` local window_start = now - (now % window_size) local function ensure_counter(key) @@ -109,7 +109,7 @@ if not dict then end local now = ngx.time() -local window_size = ` + "60" + ` +local window_size = ` + openRestyObservabilityWindowSize + ` local window_start = now - (now % window_size) local current_window = tostring(window_start)