diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2018-09-20 19:58:12 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2018-09-20 19:58:12 +0200 |
| commit | 6cee973cb5514a9ab06a2d258dd4bc527004c23f (patch) | |
| tree | 71cba232fcb0af3f50a760619f54f989d63b3945 | |
| parent | 2d41b5d964069b07448877b6e71701b4f0a37517 (diff) | |
syz-ci: fix manager http addr
Manager http addr is usually just ":port".
Prepend "127.0.0.1" in such case.
| -rw-r--r-- | syz-ci/manager.go | 8 | ||||
| -rw-r--r-- | syz-ci/syz-ci.go | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/syz-ci/manager.go b/syz-ci/manager.go index e75b58210..4dd765010 100644 --- a/syz-ci/manager.go +++ b/syz-ci/manager.go @@ -115,7 +115,7 @@ func createManager(cfg *Config, mgrcfg *ManagerConfig, stop chan struct{}) *Mana } managercfg.Name = cfg.Name + "-" + mgrcfg.Name managercfg.Syzkaller = filepath.FromSlash("syzkaller/current") - if managercfg.HTTP == "" && cfg.ManagerPort != 0 { + if managercfg.HTTP == "" { managercfg.HTTP = fmt.Sprintf(":%v", cfg.ManagerPort) cfg.ManagerPort++ } @@ -599,7 +599,11 @@ func (mgr *Manager) uploadCoverReport() error { return fmt.Errorf("failed to create GCS client: %v", err) } defer GCS.Close() - resp, err := http.Get(fmt.Sprintf("http://%v/cover", mgr.managercfg.HTTP)) + addr := mgr.managercfg.HTTP + if addr != "" && addr[0] == ':' { + addr = "127.0.0.1" + addr // in case addr is ":port" + } + resp, err := http.Get(fmt.Sprintf("http://%v/cover", addr)) if err != nil { return fmt.Errorf("failed to get report: %v", err) } diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index a11720c8e..93d5572dc 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -201,6 +201,7 @@ func loadConfig(filename string) (*Config, error) { cfg := &Config{ SyzkallerRepo: "https://github.com/google/syzkaller.git", SyzkallerBranch: "master", + ManagerPort: 10000, Goroot: os.Getenv("GOROOT"), } if err := config.LoadFile(filename, cfg); err != nil { |