From f0dccc58aa1f4729f65ae5072a1eb027043389bf Mon Sep 17 00:00:00 2001
From: Harvey Tindall <hrfee@protonmail.ch>
Date: Tue, 23 Mar 2021 21:59:04 +0000
Subject: [PATCH] separate pprof from debug mode

enabled with -pprof now.
---
 main.go   | 14 ++++++++++++--
 router.go |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index 6ede57a..6b628a3 100644
--- a/main.go
+++ b/main.go
@@ -38,6 +38,7 @@ var (
 	DATA, CONFIG, HOST *string
 	PORT               *int
 	DEBUG              *bool
+	PPROF              *bool
 	TEST               bool
 	SWAGGER            *bool
 	warning            = color.New(color.FgYellow).SprintfFunc()
@@ -172,7 +173,8 @@ func start(asDaemon, firstCall bool) {
 		CONFIG = flag.String("config", app.configPath, "alternate path to config file.")
 		HOST = flag.String("host", "", "alternate address to host web ui on.")
 		PORT = flag.Int("port", 0, "alternate port to host web ui on.")
-		DEBUG = flag.Bool("debug", false, "Enables debug logging and exposes pprof.")
+		DEBUG = flag.Bool("debug", false, "Enables debug logging.")
+		PPROF = flag.Bool("pprof", false, "Exposes pprof profiler on /debug/pprof.")
 		SWAGGER = flag.Bool("swagger", false, "Enable swagger at /swagger/index.html")
 
 		flag.Parse()
@@ -182,6 +184,9 @@ func start(asDaemon, firstCall bool) {
 		if *DEBUG {
 			os.Setenv("DEBUG", "1")
 		}
+		if *PPROF {
+			os.Setenv("PPROF", "1")
+		}
 	}
 
 	if os.Getenv("SWAGGER") == "1" {
@@ -190,6 +195,9 @@ func start(asDaemon, firstCall bool) {
 	if os.Getenv("DEBUG") == "1" {
 		*DEBUG = true
 	}
+	if os.Getenv("PPROF") == "1" {
+		*PPROF = true
+	}
 	// attempt to apply command line flags correctly
 	if app.configPath == *CONFIG && app.dataPath != *DATA {
 		app.dataPath = *DATA
@@ -248,11 +256,13 @@ func start(asDaemon, firstCall bool) {
 		debugMode = true
 	}
 	if debugMode {
-		app.info.Print(warning("\n\nWARNING: Don't use debug mode in production, as it exposes pprof on the network.\n\n"))
 		app.debug = NewLogger(os.Stdout, "[DEBUG] ", log.Ltime|log.Lshortfile, color.FgYellow)
 	} else {
 		app.debug = emptyLogger(false)
 	}
+	if *PPROF {
+		app.info.Print(warning("\n\nWARNING: Don't use pprof in production.\n\n"))
+	}
 
 	// Starts listener to receive commands over a unix socket. Use with 'jfa-go start/stop'
 	if asDaemon {
diff --git a/router.go b/router.go
index 5e2c524..b94c2b0 100644
--- a/router.go
+++ b/router.go
@@ -85,7 +85,7 @@ func (app *appContext) loadRouter(address string, debug bool) *gin.Engine {
 	app.loadHTML(router)
 	router.Use(static.Serve("/", app.webFS))
 	router.NoRoute(app.NoRouteHandler)
-	if debug {
+	if *PPROF {
 		app.debug.Println("Loading pprof")
 		pprof.Register(router)
 	}