From ee32e8ecd404a1284361ad1f3a7d8cf085aa98d4 Mon Sep 17 00:00:00 2001
From: Tim Van Baak <tim.vanbaak@gmail.com>
Date: Fri, 21 Feb 2025 20:41:37 -0800
Subject: [PATCH] Set global default timeout to 2 minutes

---
 cmd/actionExecute.go | 3 +--
 cmd/sourceFetch.go   | 2 +-
 cmd/sourceTest.go    | 2 +-
 core/cron.go         | 2 +-
 core/execute.go      | 2 ++
 core/source.go       | 2 +-
 web/item.go          | 2 +-
 web/source.go        | 2 +-
 8 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cmd/actionExecute.go b/cmd/actionExecute.go
index 807b25b..9c4220c 100644
--- a/cmd/actionExecute.go
+++ b/cmd/actionExecute.go
@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"log"
 	"slices"
-	"time"
 
 	"github.com/Jaculabilis/intake/core"
 	"github.com/spf13/cobra"
@@ -99,7 +98,7 @@ func actionExecute(
 		}
 	}
 
-	newItem, newState, errItem, err := core.ExecuteItemAction(item, argv, envs, state, time.Minute, postProcess)
+	newItem, newState, errItem, err := core.ExecuteItemAction(item, argv, envs, state, core.DefaultTimeout, postProcess)
 	if err != nil {
 		core.AddErrorItem(db, errItem)
 		log.Fatalf("error executing %s: %v", action, err)
diff --git a/cmd/sourceFetch.go b/cmd/sourceFetch.go
index 8ba611d..41900ff 100644
--- a/cmd/sourceFetch.go
+++ b/cmd/sourceFetch.go
@@ -48,7 +48,7 @@ func sourceFetch(source string, format string, dryRun bool) {
 		log.Fatalf("error: failed to load data for %s: %v", source, err)
 	}
 
-	items, newState, errItem, err := core.Execute(source, argv, envs, state, "", time.Minute, postProcess)
+	items, newState, errItem, err := core.Execute(source, argv, envs, state, "", core.DefaultTimeout, postProcess)
 	if err != nil {
 		core.AddErrorItem(db, errItem)
 		log.Fatalf("error: failed to execute fetch: %v", err)
diff --git a/cmd/sourceTest.go b/cmd/sourceTest.go
index 50c87f9..5175432 100644
--- a/cmd/sourceTest.go
+++ b/cmd/sourceTest.go
@@ -33,7 +33,7 @@ func init() {
 func sourceTest(env []string, format string, cmd []string) {
 	formatter := formatAs(format)
 
-	items, state, _, err := core.Execute("test", cmd, env, nil, "", time.Minute, nil)
+	items, state, _, err := core.Execute("test", cmd, env, nil, "", core.DefaultTimeout, nil)
 	log.Printf("returned %d items", len(items))
 	log.Printf("wrote %d bytes of state", len(state))
 	if err != nil {
diff --git a/core/cron.go b/core/cron.go
index d72a1d4..3c4d007 100644
--- a/core/cron.go
+++ b/core/cron.go
@@ -209,7 +209,7 @@ func fetchReadySources(db DB) {
 			continue
 		}
 
-		items, newState, errItem, err := Execute(schedule.Source, argv, envs, state, "", time.Minute, postProcess)
+		items, newState, errItem, err := Execute(schedule.Source, argv, envs, state, "", DefaultTimeout, postProcess)
 		if err != nil {
 			AddErrorItem(db, errItem)
 			log.Printf("error: failed to execute fetch: %v", err)
diff --git a/core/execute.go b/core/execute.go
index d06aab7..7c45dc1 100644
--- a/core/execute.go
+++ b/core/execute.go
@@ -13,6 +13,8 @@ import (
 	"time"
 )
 
+var DefaultTimeout = time.Minute * 2
+
 func readPipe(
 	f io.ReadCloser,
 	send chan []byte,
diff --git a/core/source.go b/core/source.go
index 0a7a71b..31bc8e8 100644
--- a/core/source.go
+++ b/core/source.go
@@ -245,7 +245,7 @@ func updateWithFetchedItemsTx(
 		for _, item := range newItems {
 			var updatedItem Item
 			var errItem Item
-			updatedItem, state, errItem, err = ExecuteItemAction(item, onCreateArgv, envs, state, time.Minute, postProcess)
+			updatedItem, state, errItem, err = ExecuteItemAction(item, onCreateArgv, envs, state, DefaultTimeout, postProcess)
 			if err != nil {
 				AddErrorItem(db, errItem)
 				log.Printf("error: on_create failed for %s/%s: %v", item.Source, item.Id, err)
diff --git a/web/item.go b/web/item.go
index 1128211..4f26136 100644
--- a/web/item.go
+++ b/web/item.go
@@ -85,7 +85,7 @@ func (env *Env) doAction(writer http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	newItem, newState, errItem, err := core.ExecuteItemAction(item, argv, envs, state, time.Minute, postProcess)
+	newItem, newState, errItem, err := core.ExecuteItemAction(item, argv, envs, state, core.DefaultTimeout, postProcess)
 	if err != nil {
 		core.AddErrorItem(env.db, errItem)
 		http.Error(writer, err.Error(), 500)
diff --git a/web/source.go b/web/source.go
index f0a91b0..8fbfc00 100644
--- a/web/source.go
+++ b/web/source.go
@@ -62,7 +62,7 @@ func (env *Env) fetchSource(writer http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	items, newState, errItem, err := core.Execute(source, argv, envs, state, "", time.Minute, postProcess)
+	items, newState, errItem, err := core.Execute(source, argv, envs, state, "", core.DefaultTimeout, postProcess)
 	if err != nil {
 		core.AddErrorItem(env.db, errItem)
 		http.Error(writer, fmt.Sprintf("error: failed to execute fetch: %v", err.Error()), 500)