Merge pull request #2147 from influxdb/set-max-procs-better-location

Set Go Max procs in a better location
influxdata · Apr 2, 2015 · 734e57a · 734e57a
2 parents bdd469d + 013e95e
commit 734e57a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v0.9.0-rc20 [unreleased]
+
+### Bugfixes
+- [#2147](https://github.com/influxdb/influxdb/pull/2147): Set Go Max procs in a better location
+- 
 ## v0.9.0-rc19 [2015-04-01]
 
 ### Features

diff --git a/cmd/influxd/main.go b/cmd/influxd/main.go
@@ -47,10 +47,6 @@ func main() {
 		commit = "unknown"
 	}
 
-	// Set parallelism.
-	runtime.GOMAXPROCS(runtime.NumCPU())
-	log.Printf("GOMAXPROCS set to %d", runtime.GOMAXPROCS(0))
-
 	// Shift binary name off argument list.
 	args := os.Args[1:]
 
@@ -121,6 +117,10 @@ func execRun(args []string) {
 	fmt.Print(logo)
 	writePIDFile(*pidPath)
 
+	// Set parallelism.
+	runtime.GOMAXPROCS(runtime.NumCPU())
+	log.Printf("GOMAXPROCS set to %d", runtime.GOMAXPROCS(0))
+
 	// Parse configuration file from disk.
 	config, err := parseConfig(*configPath, *hostname)
 	if err != nil {