Set maximum write timeout

livepeer · Jan 25, 2024 · 12c1ada · 12c1ada
1 parent 58cf59f
commit 12c1ada
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/catalyst-uploader.go b/catalyst-uploader.go
@@ -25,8 +25,9 @@ func run() int {
 		glog.Fatal(err)
 	}
 	// cmd line args
+	var timeout time.Duration
 	describe := flag.Bool("j", false, "Describe supported storage services in JSON format and exit")
-	timeout := flag.Duration("t", 30*time.Second, "Upload timeout")
+	flag.DurationVar(&timeout, "t", 30*time.Second, "Upload timeout")
 	flag.Parse()
 
 	// list enabled handlers and exit
@@ -50,7 +51,12 @@ func run() int {
 		return 1
 	}
 
-	err = core.Upload(os.Stdin, uri, WaitBetweenWrites, *timeout)
+	const maxTimeout = 5 * time.Minute
+	if timeout > maxTimeout {
+		timeout = maxTimeout
+	}
+
+	err = core.Upload(os.Stdin, uri, WaitBetweenWrites, timeout)
 	if err != nil {
 		glog.Fatalf("Uploader failed for %s: %s", uri, err)
 		return 1