Browse Source

Adjust default build set to remove pprof from default distribution

Shelikhoo 1 year ago
parent
commit
c5dcf1be03
2 changed files with 4 additions and 4 deletions
  1. 0 1
      main/distro/all/all.go
  2. 4 3
      main/plugins/plugin_pprof/plugin_pprof.go

+ 0 - 1
main/distro/all/all.go

@@ -33,7 +33,6 @@ import (
 	// Developer preview features
 	// Developer preview features
 	_ "github.com/v2fly/v2ray-core/v5/app/instman"
 	_ "github.com/v2fly/v2ray-core/v5/app/instman"
 	_ "github.com/v2fly/v2ray-core/v5/app/observatory"
 	_ "github.com/v2fly/v2ray-core/v5/app/observatory"
-	_ "github.com/v2fly/v2ray-core/v5/app/restfulapi"
 	_ "github.com/v2fly/v2ray-core/v5/app/tun"
 	_ "github.com/v2fly/v2ray-core/v5/app/tun"
 
 
 	// Inbound and outbound proxies.
 	// Inbound and outbound proxies.

+ 4 - 3
main/plugins/plugin_pprof.go → main/plugins/plugin_pprof/plugin_pprof.go

@@ -1,13 +1,14 @@
-package plugins
+package plugin_pprof
 
 
 import (
 import (
+	"github.com/v2fly/v2ray-core/v5/main/plugins"
 	"net/http"
 	"net/http"
 	"net/http/pprof"
 	"net/http/pprof"
 
 
 	"github.com/v2fly/v2ray-core/v5/main/commands/base"
 	"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", "", "")
 	addr := cmd.Flag.String("pprof", "", "")
 	return func() error {
 	return func() error {
 		if *addr != "" {
 		if *addr != "" {
@@ -24,5 +25,5 @@ var pprofPlugin Plugin = func(cmd *base.Command) func() error {
 }
 }
 
 
 func init() {
 func init() {
-	RegisterPlugin(pprofPlugin)
+	plugins.RegisterPlugin(pprofPlugin)
 }
 }