[trafficcontrol] 05/05: stop profiling loop when profiling is switched off

[de...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dewrich pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git

commit 67d4df00533d67a3c2429401150d71744ba06457
Author: Dylan Volz <Dy...@comcast.com>
AuthorDate: Thu Jul 5 11:40:08 2018 -0600

    stop profiling loop when profiling is switched off
---
 traffic_ops/traffic_ops_golang/config/config.go      | 2 --
 traffic_ops/traffic_ops_golang/routing.go            | 2 +-
 traffic_ops/traffic_ops_golang/traffic_ops_golang.go | 6 +++++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/traffic_ops/traffic_ops_golang/config/config.go b/traffic_ops/traffic_ops_golang/config/config.go
index c90c4e1..218d3aa 100644
--- a/traffic_ops/traffic_ops_golang/config/config.go
+++ b/traffic_ops/traffic_ops_golang/config/config.go
@@ -129,8 +129,6 @@ func (c Config) EventLog() log.LogLocation {
 const BlockStartup = true
 const AllowStartup = false
 
-
-
 func LoadCdnConfig(cdnConfPath string) (Config, error) {
 	// load json from cdn.conf
 	confBytes, err := ioutil.ReadFile(cdnConfPath)
diff --git a/traffic_ops/traffic_ops_golang/routing.go b/traffic_ops/traffic_ops_golang/routing.go
index c675aa7..c526729 100644
--- a/traffic_ops/traffic_ops_golang/routing.go
+++ b/traffic_ops/traffic_ops_golang/routing.go
@@ -73,7 +73,7 @@ func getDefaultMiddleware(secret string) []Middleware {
 // ServerData ...
 type ServerData struct {
 	config.Config
-	DB *sqlx.DB
+	DB        *sqlx.DB
 	Profiling *bool // Yes this is a field in the config but we want to live reload this value and NOT the entire config
 }
 
diff --git a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
index 55406e2..3966f0c 100644
--- a/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
+++ b/traffic_ops/traffic_ops_golang/traffic_ops_golang.go
@@ -230,13 +230,17 @@ func continuousProfile(profiling *bool, profilingDir *string, version string) {
 				f, err := os.Create(filename)
 				if err != nil {
 					log.Errorf("creating profile: %v\n", err)
-					os.Exit(1)
+					log.Infof("Exiting profiling")
+					break
 				}
 
 				pprof.StartCPUProfile(f)
 				time.Sleep(time.Minute)
 				pprof.StopCPUProfile()
 				f.Close()
+				if !*profiling {
+					break
+				}
 			}
 		}()
 	}