From e489b6cafdd3702f6d14307ae2f2278c3c2f6783 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Mon, 17 Jul 2017 11:19:10 +0200
Subject: syz-ci: don't duplicate manager config default values

---
 syz-ci/manager.go                  |  8 +-------
 syz-manager/mgrconfig/mgrconfig.go | 10 +++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/syz-ci/manager.go b/syz-ci/manager.go
index cfa513246..630a7cdbd 100644
--- a/syz-ci/manager.go
+++ b/syz-ci/manager.go
@@ -302,13 +302,7 @@ func (mgr *Manager) restartManager() {
 }
 
 func (mgr *Manager) writeConfig(info *BuildInfo) (string, error) {
-	mgrcfg := &mgrconfig.Config{
-		Cover:     true,
-		Reproduce: true,
-		Sandbox:   "setuid",
-		Rpc:       ":0",
-		Procs:     1,
-	}
+	mgrcfg := mgrconfig.DefaultValues()
 	err := config.LoadData(mgr.mgrcfg.Manager_Config, mgrcfg)
 	if err != nil {
 		return "", err
diff --git a/syz-manager/mgrconfig/mgrconfig.go b/syz-manager/mgrconfig/mgrconfig.go
index 1ed17719d..0b7c2e845 100644
--- a/syz-manager/mgrconfig/mgrconfig.go
+++ b/syz-manager/mgrconfig/mgrconfig.go
@@ -69,14 +69,18 @@ func LoadFile(filename string) (*Config, map[int]bool, error) {
 	return load(nil, filename)
 }
 
-func load(data []byte, filename string) (*Config, map[int]bool, error) {
-	cfg := &Config{
+func DefaultValues() *Config {
+	return &Config{
 		Cover:     true,
 		Reproduce: true,
 		Sandbox:   "setuid",
-		Rpc:       "localhost:0",
+		Rpc:       ":0",
 		Procs:     1,
 	}
+}
+
+func load(data []byte, filename string) (*Config, map[int]bool, error) {
+	cfg := DefaultValues()
 	if data != nil {
 		if err := config.LoadData(data, cfg); err != nil {
 			return nil, nil, err
-- 
cgit mrf-deployment