summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmd/dcat/main.go7
-rw-r--r--cmd/dgrep/main.go7
-rw-r--r--cmd/dmap/main.go6
-rw-r--r--cmd/drun/main.go6
-rw-r--r--cmd/dserver/main.go7
-rw-r--r--cmd/dtail/main.go7
-rw-r--r--internal/config/common.go9
-rw-r--r--samples/dtail.json.sample3
8 files changed, 0 insertions, 52 deletions
diff --git a/cmd/dcat/main.go b/cmd/dcat/main.go
index 1ec945d..af46db1 100644
--- a/cmd/dcat/main.go
+++ b/cmd/dcat/main.go
@@ -9,7 +9,6 @@ import (
"github.com/mimecast/dtail/internal/color"
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
)
@@ -23,7 +22,6 @@ func main() {
var displayVersion bool
var files string
var noColor bool
- var pprofEnable bool
var serversStr string
var silentEnable bool
var sshPort int
@@ -34,7 +32,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.BoolVar(&silentEnable, "silent", false, "Reduce output")
flag.BoolVar(&trustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
flag.IntVar(&connectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
@@ -59,10 +56,6 @@ func main() {
logger.Start(ctx, serverEnable, debugEnable, silentEnable, silentEnable)
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
-
args := clients.Args{
ConnectionsPerCPU: connectionsPerCPU,
ServersStr: serversStr,
diff --git a/cmd/dgrep/main.go b/cmd/dgrep/main.go
index 74a501f..9393cf6 100644
--- a/cmd/dgrep/main.go
+++ b/cmd/dgrep/main.go
@@ -9,7 +9,6 @@ import (
"github.com/mimecast/dtail/internal/color"
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
)
@@ -23,7 +22,6 @@ func main() {
var displayVersion bool
var files string
var noColor bool
- var pprofEnable bool
var regex string
var serversStr string
var silentEnable bool
@@ -35,7 +33,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.BoolVar(&silentEnable, "silent", false, "Reduce output")
flag.BoolVar(&trustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
flag.IntVar(&connectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
@@ -60,10 +57,6 @@ func main() {
serverEnable := false
logger.Start(ctx, serverEnable, debugEnable, silentEnable, silentEnable)
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
-
args := clients.Args{
ConnectionsPerCPU: connectionsPerCPU,
ServersStr: serversStr,
diff --git a/cmd/dmap/main.go b/cmd/dmap/main.go
index f3f706a..07b7f2f 100644
--- a/cmd/dmap/main.go
+++ b/cmd/dmap/main.go
@@ -10,7 +10,6 @@ import (
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
"github.com/mimecast/dtail/internal/omode"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
)
@@ -24,7 +23,6 @@ func main() {
var displayVersion bool
var files string
var noColor bool
- var pprofEnable bool
var queryStr string
var serversStr string
var silentEnable bool
@@ -36,7 +34,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.BoolVar(&silentEnable, "silent", false, "Reduce output")
flag.BoolVar(&trustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
flag.IntVar(&connectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
@@ -61,9 +58,6 @@ func main() {
serverEnable := false
logger.Start(ctx, serverEnable, debugEnable, silentEnable, silentEnable)
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
args := clients.Args{
ConnectionsPerCPU: connectionsPerCPU,
diff --git a/cmd/drun/main.go b/cmd/drun/main.go
index b1936d4..986b97d 100644
--- a/cmd/drun/main.go
+++ b/cmd/drun/main.go
@@ -9,7 +9,6 @@ import (
"github.com/mimecast/dtail/internal/color"
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
)
@@ -23,7 +22,6 @@ func main() {
var discovery string
var displayVersion bool
var noColor bool
- var pprofEnable bool
var serversStr string
var silentEnable bool
var sshPort int
@@ -34,7 +32,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.BoolVar(&silentEnable, "silent", false, "Reduce output")
flag.BoolVar(&trustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
flag.IntVar(&connectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
@@ -58,9 +55,6 @@ func main() {
serverEnable := false
logger.Start(ctx, serverEnable, debugEnable, silentEnable, silentEnable)
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
args := clients.Args{
ConnectionsPerCPU: connectionsPerCPU,
diff --git a/cmd/dserver/main.go b/cmd/dserver/main.go
index 03834f1..e265023 100644
--- a/cmd/dserver/main.go
+++ b/cmd/dserver/main.go
@@ -9,7 +9,6 @@ import (
"github.com/mimecast/dtail/internal/color"
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/server"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
@@ -21,7 +20,6 @@ func main() {
var debugEnable bool
var displayVersion bool
var noColor bool
- var pprofEnable bool
var shutdownAfter int
var sshPort int
@@ -30,7 +28,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.IntVar(&shutdownAfter, "shutdownAfter", 0, "Automatically shutdown after so many seconds")
flag.IntVar(&sshPort, "port", 2222, "SSH server port")
flag.StringVar(&cfgFile, "cfg", "", "Config file path")
@@ -64,10 +61,6 @@ func main() {
}()
}
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
-
serv := server.New()
status := serv.Start(ctx)
logger.Flush()
diff --git a/cmd/dtail/main.go b/cmd/dtail/main.go
index 76070ff..a243873 100644
--- a/cmd/dtail/main.go
+++ b/cmd/dtail/main.go
@@ -10,7 +10,6 @@ import (
"github.com/mimecast/dtail/internal/config"
"github.com/mimecast/dtail/internal/io/logger"
"github.com/mimecast/dtail/internal/omode"
- "github.com/mimecast/dtail/internal/pprof"
"github.com/mimecast/dtail/internal/user"
"github.com/mimecast/dtail/internal/version"
)
@@ -25,7 +24,6 @@ func main() {
var displayVersion bool
var files string
var noColor bool
- var pprofEnable bool
var queryStr string
var regex string
var serversStr string
@@ -39,7 +37,6 @@ func main() {
flag.BoolVar(&debugEnable, "debug", false, "Activate debug messages")
flag.BoolVar(&displayVersion, "version", false, "Display version")
flag.BoolVar(&noColor, "noColor", false, "Disable ANSII terminal colors")
- flag.BoolVar(&pprofEnable, "pprofEnable", false, "Enable pprof server")
flag.BoolVar(&silentEnable, "silent", false, "Reduce output")
flag.BoolVar(&trustAllHosts, "trustAllHosts", false, "Auto trust all unknown host keys")
flag.IntVar(&connectionsPerCPU, "cpc", 10, "How many connections established per CPU core concurrently")
@@ -74,10 +71,6 @@ func main() {
}
logger.Start(ctx, serverEnable, debugEnable, silentEnable, silentEnable)
- if pprofEnable || config.Common.PProfEnable {
- pprof.Start()
- }
-
args := clients.Args{
ConnectionsPerCPU: connectionsPerCPU,
ServersStr: serversStr,
diff --git a/internal/config/common.go b/internal/config/common.go
index 8c07710..57f040c 100644
--- a/internal/config/common.go
+++ b/internal/config/common.go
@@ -18,12 +18,6 @@ type CommonConfig struct {
LogDir string
// The cache directory
CacheDir string
- // Do we want to enable pperf http server?
- PProfEnable bool `json:",omitempty"`
- // The HTTP port used by PProf
- PProfPort int `json:",omitempty"`
- // The PProf HTTP server bind address
- PProfBindAddress string `json:",omitempty"`
}
// Create a new default configuration.
@@ -35,8 +29,5 @@ func newDefaultCommonConfig() *CommonConfig {
ExperimentalFeaturesEnable: false,
LogDir: "log",
CacheDir: "cache",
- PProfEnable: false,
- PProfPort: 6060,
- PProfBindAddress: "0.0.0.0",
}
}
diff --git a/samples/dtail.json.sample b/samples/dtail.json.sample
index 83925c6..bac1f83 100644
--- a/samples/dtail.json.sample
+++ b/samples/dtail.json.sample
@@ -32,9 +32,6 @@
"LogStrategy": "stdout",
"SSHPort": 2222,
"DebugEnable": false,
- "PPerfEnable": false,
- "PPerfPort": 6060,
- "PPerfBindAddress": "0.0.0.0",
"ExperimentalFeaturesEnable": false
}
}