Merge pull request #562 from damekr/implement-gomaxprocs-env

Issue-535: restic respect GOMAXPROCS env variable depending on go version

src/cmds/restic/main.go

@@ -2,17 +2,23 @@ package main
 
 import (
 	"fmt"
-	"os"
-	"runtime"
-
 	"github.com/jessevdk/go-flags"
+	"os"
 	"restic"
 	"restic/debug"
+	"runtime"
 )
 
 func init() {
 	// set GOMAXPROCS to number of CPUs
+	if runtime.Version() < "go1.5" {
+		gomaxprocs := os.Getenv("GOMAXPROCS")
+		debug.Log("restic", "read GOMAXPROCS from env variable, value: %s", gomaxprocs)
+		if gomaxprocs == "" {
 			runtime.GOMAXPROCS(runtime.NumCPU())
+		}
+	}
+
 }
 
 func main() {