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

Remove argument used only for logging

Browse Source
This commit is contained in:
Tim Van Baak 2025-01-30 08:27:45 -08:00
parent 9bf840fcec
commit 68038839ec
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/actionExecute.go
View File

@ -98,9 +98,9 @@ func actionExecute(
log.Fatalf("error: failed to get action: %v", err) log.Fatalf("error: failed to get action: %v", err)
} }
newItem, err := core.ExecuteItemAction(item, source, argv, nil, "", time.Minute) newItem, err := core.ExecuteItemAction(item, argv, nil, "", time.Minute)
if err != nil { if err != nil {
log.Fatalf("error executing action: %v", err) log.Fatalf("error executing %s: %v", action, err)
} }
if diff { if diff {

3
core/action.go
View File

@ -212,7 +212,6 @@ func Execute(
// Execute an action that takes an item as input and returns the item modified. // Execute an action that takes an item as input and returns the item modified.
func ExecuteItemAction( func ExecuteItemAction(
item Item, item Item,
action string,
argv []string, argv []string,
env []string, env []string,
statePath string, statePath string,
@ -225,7 +224,7 @@ func ExecuteItemAction(
res, err := Execute(item.Source, argv, env, statePath, string(itemJson), timeout) res, err := Execute(item.Source, argv, env, statePath, string(itemJson), timeout)
if err != nil { if err != nil {
return Item{}, fmt.Errorf("failed to execute %s for %s/%s: %v", action, item.Source, item.Id, err) return Item{}, fmt.Errorf("failed to execute action for %s/%s: %v", item.Source, item.Id, err)
} }
if len(res) != 1 { if len(res) != 1 {
return Item{}, fmt.Errorf("expected action to produce exactly one item, got %d", len(res)) return Item{}, fmt.Errorf("expected action to produce exactly one item, got %d", len(res))

4
core/source.go
View File

@ -284,9 +284,9 @@ func UpdateWithFetchedItems(db *DB, source string, items []Item) (int, int, erro
if err == nil { if err == nil {
var updatedNewItems []Item var updatedNewItems []Item
for _, item := range newItems { for _, item := range newItems {
updatedItem, err := ExecuteItemAction(item, "on_create", onCreateArgv, nil, "", time.Minute) updatedItem, err := ExecuteItemAction(item, onCreateArgv, nil, "", time.Minute)
if err != nil { if err != nil {
log.Printf("error: %v", err) log.Printf("error: on_create failed for %s/%s: %v", item.Source, item.Id, err)
} }
updatedNewItems = append(updatedNewItems, updatedItem) updatedNewItems = append(updatedNewItems, updatedItem)
} }

2
web/item.go
View File

@ -61,7 +61,7 @@ func (env *Env) doAction(writer http.ResponseWriter, req *http.Request) {
return return
} }
newItem, err := core.ExecuteItemAction(item, action, argv, nil, "", time.Minute) newItem, err := core.ExecuteItemAction(item, argv, nil, "", time.Minute)
if err != nil { if err != nil {
http.Error(writer, err.Error(), 500) http.Error(writer, err.Error(), 500)
return return