Jaculabilis/intake
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set global default timeout to 2 minutes

Browse Source
This commit is contained in:
Tim Van Baak 2025-02-21 20:41:37 -08:00
parent 5607116b30
commit ee32e8ecd4
8 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/actionExecute.go
View File

@ -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)

2
cmd/sourceFetch.go
View File

@ -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)

2
cmd/sourceTest.go
View File

@ -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 {

2
core/cron.go
View File

@ -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)

2
core/execute.go
View File

@ -13,6 +13,8 @@ import (
"time"
)
var DefaultTimeout = time.Minute * 2
func readPipe(
f io.ReadCloser,
send chan []byte,

2
core/source.go
View File

@ -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)

2
web/item.go
View File

@ -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)

2
web/source.go
View File

@ -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)