From 1b9f64757a7358e28cc89893899f4016d8d7b223 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 29 Dec 2025 12:40:18 +0100 Subject: pkg/tool: add ServeHTTP function Dedup code in syz-ci and syz-hub. --- syz-ci/syz-ci.go | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'syz-ci') diff --git a/syz-ci/syz-ci.go b/syz-ci/syz-ci.go index fd1f2a7bb..644b290da 100644 --- a/syz-ci/syz-ci.go +++ b/syz-ci/syz-ci.go @@ -57,7 +57,6 @@ import ( "errors" "flag" "fmt" - "net" "net/http" _ "net/http/pprof" "os" @@ -72,6 +71,7 @@ import ( "github.com/google/syzkaller/pkg/log" "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" + "github.com/google/syzkaller/pkg/tool" "github.com/google/syzkaller/pkg/updater" "github.com/google/syzkaller/pkg/vcs" ) @@ -265,7 +265,7 @@ func main() { shutdownPending := make(chan struct{}) osutil.HandleInterrupts(shutdownPending) - serveHTTP(cfg) + tool.ServeHTTP(cfg.HTTP) if cfg.Goroot != "" { os.Setenv("GOROOT", cfg.Goroot) @@ -396,18 +396,6 @@ loop: } } -func serveHTTP(cfg *Config) { - ln, err := net.Listen("tcp4", cfg.HTTP) - if err != nil { - log.Fatalf("failed to listen on %v: %v", cfg.HTTP, err) - } - log.Logf(0, "serving http on http://%v", ln.Addr()) - go func() { - err := http.Serve(ln, nil) - log.Fatalf("failed to serve http: %v", err) - }() -} - func uploadSyzkallerBuildError(cfg *Config, commit *vcs.Commit, compilerID string, buildErr error) { var output []byte var verbose *osutil.VerboseError -- cgit mrf-deployment