From c5dcf1be03fe9d708e5e636867aae2aae28dce16 Mon Sep 17 00:00:00 2001 From: Shelikhoo Date: Fri, 6 Sep 2024 15:11:56 +0100 Subject: [PATCH] Adjust default build set to remove pprof from default distribution --- main/distro/all/all.go | 1 - main/plugins/{ => plugin_pprof}/plugin_pprof.go | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) rename main/plugins/{ => plugin_pprof}/plugin_pprof.go (76%) diff --git a/main/distro/all/all.go b/main/distro/all/all.go index 16ca28b09..668f80c97 100644 --- a/main/distro/all/all.go +++ b/main/distro/all/all.go @@ -33,7 +33,6 @@ import ( // Developer preview features _ "github.com/v2fly/v2ray-core/v5/app/instman" _ "github.com/v2fly/v2ray-core/v5/app/observatory" - _ "github.com/v2fly/v2ray-core/v5/app/restfulapi" _ "github.com/v2fly/v2ray-core/v5/app/tun" // Inbound and outbound proxies. diff --git a/main/plugins/plugin_pprof.go b/main/plugins/plugin_pprof/plugin_pprof.go similarity index 76% rename from main/plugins/plugin_pprof.go rename to main/plugins/plugin_pprof/plugin_pprof.go index 85f3bf763..5da1a7b75 100644 --- a/main/plugins/plugin_pprof.go +++ b/main/plugins/plugin_pprof/plugin_pprof.go @@ -1,13 +1,14 @@ -package plugins +package plugin_pprof import ( + "github.com/v2fly/v2ray-core/v5/main/plugins" "net/http" "net/http/pprof" "github.com/v2fly/v2ray-core/v5/main/commands/base" ) -var pprofPlugin Plugin = func(cmd *base.Command) func() error { +var pprofPlugin plugins.Plugin = func(cmd *base.Command) func() error { addr := cmd.Flag.String("pprof", "", "") return func() error { if *addr != "" { @@ -24,5 +25,5 @@ var pprofPlugin Plugin = func(cmd *base.Command) func() error { } func init() { - RegisterPlugin(pprofPlugin) + plugins.RegisterPlugin(pprofPlugin) }