tcjlj/OpenFlare
1
0
Fork 0
mirror of https://github.com/Rain-kl/OpenFlare.git synced 2026-10-12 02:06:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

[优化] 代码优化

Browse Source
This commit is contained in:
ryan
2026-05-31 20:05:35 +08:00
parent 5612403d48
commit 81ba309650
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openflare_agent/cmd/agent/main.go
+1 -1
View File
@@ -71,7 +71,7 @@ func main() {
LuaDir: cfg.LuaDir, LuaDir: cfg.LuaDir,
NginxLuaDir: cfg.OpenrestyLuaDir, NginxLuaDir: cfg.OpenrestyLuaDir,
RuntimeConfigDir: cfg.RuntimeConfigDir, RuntimeConfigDir: cfg.RuntimeConfigDir,
OpenrestyObservabilityListen: nginx.ObservabilityListenAddress(cfg.OpenrestyPath, cfg.OpenrestyObservabilityPort), OpenrestyObservabilityListen: nginx.ObservabilityListenAddress(cfg.OpenrestyObservabilityPort),
OpenrestyObservabilityPort: cfg.OpenrestyObservabilityPort, OpenrestyObservabilityPort: cfg.OpenrestyObservabilityPort,
OpenrestyResolverDirective: "", OpenrestyResolverDirective: "",
Executor: nginx.NewExecutor(nginx.ExecutorOptions{ Executor: nginx.NewExecutor(nginx.ExecutorOptions{
openflare_agent/internal/nginx/manager.go
+6 -6
View File
@@ -102,7 +102,7 @@ func (e *PathExecutor) Reload(ctx context.Context) error {
return nil 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 { if err := e.Test(ctx); err != nil {
return err return err
} }
@@ -479,7 +479,7 @@ func parseNginxVersion(output string) string {
return matches[1] 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 { func isIgnorableOpenrestyStopError(output string) bool {
text := strings.ToLower(strings.TrimSpace(output)) text := strings.ToLower(strings.TrimSpace(output))
@@ -1095,22 +1095,22 @@ func (m *Manager) managedWAFLuaFiles() []protocol.SupportFile {
return files return files
} }
func ObservabilityListenAddress(openrestyPath string, port int) string { func ObservabilityListenAddress(port int) string {
if port <= 0 { if port <= 0 {
return "" return ""
} }
return fmt.Sprintf("127.0.0.1:%d", port) return fmt.Sprintf("127.0.0.1:%d", port)
} }
func ResolverDirective(openrestyPath string, explicitResolvers []string) string { func ResolverDirective(explicitResolvers []string) string {
resolvers := resolverAddresses(openrestyPath, explicitResolvers) resolvers := resolverAddresses(explicitResolvers)
if len(resolvers) == 0 { if len(resolvers) == 0 {
return "" return ""
} }
return fmt.Sprintf(" resolver %s valid=30s ipv6=off;\n resolver_timeout 5s;\n", strings.Join(resolvers, " ")) 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 { if resolvers := utils.UniqueAndCleanStringSlice(explicitResolvers); len(resolvers) > 0 {
return resolvers return resolvers
} }
openflare_agent/internal/nginx/manager_test.go
+3 -3
View File
@@ -392,7 +392,7 @@ func TestManagerCheckHealthFailsWhenStubStatusUnavailable(t *testing.T) {
} }
func TestResolverDirectiveUsesExplicitResolvers(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") { if !strings.Contains(got, "resolver 10.0.0.2 1.1.1.1") {
t.Fatalf("expected explicit resolver directive, got %q", got) t.Fatalf("expected explicit resolver directive, got %q", got)
} }
@@ -916,10 +916,10 @@ func TestManagerApplyRejectsCertFilePathTraversal(t *testing.T) {
} }
func TestObservabilityListenAddress(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) 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) t.Fatalf("unexpected path observability listen address: %s", got)
} }
} }
openflare_agent/internal/nginx/observability_assets.go
+5 -5
View File
@@ -3,8 +3,8 @@ package nginx
import "openflare-agent/internal/protocol" import "openflare-agent/internal/protocol"
const ( const (
openRestyObservabilityWindowTTL = 7200 openRestyObservabilityWindowTTL = "7200"
openRestyObservabilityWindowSize = 60 openRestyObservabilityWindowSize = "60"
) )
const openRestyObservabilityInitLua = `local dict = ngx.shared.openflare_observability const openRestyObservabilityInitLua = `local dict = ngx.shared.openflare_observability
@@ -25,9 +25,9 @@ if request_uri == "/openflare/observability" or request_uri == "/openflare/stub_
return return
end end
local ttl = ` + "7200" + ` local ttl = ` + openRestyObservabilityWindowTTL + `
local now = ngx.time() local now = ngx.time()
local window_size = ` + "60" + ` local window_size = ` + openRestyObservabilityWindowSize + `
local window_start = now - (now % window_size) local window_start = now - (now % window_size)
local function ensure_counter(key) local function ensure_counter(key)
@@ -109,7 +109,7 @@ if not dict then
end end
local now = ngx.time() local now = ngx.time()
local window_size = ` + "60" + ` local window_size = ` + openRestyObservabilityWindowSize + `
local window_start = now - (now % window_size) local window_start = now - (now % window_size)
local current_window = tostring(window_start) local current_window = tostring(window_start)