From 68038839ecd83e414cda489dfaf0c6b47566a852 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Thu, 30 Jan 2025 08:27:45 -0800 Subject: [PATCH] Remove argument used only for logging --- cmd/actionExecute.go | 4 ++-- core/action.go | 3 +-- core/source.go | 4 ++-- web/item.go | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/cmd/actionExecute.go b/cmd/actionExecute.go index c7c043b..bfbd1f9 100644 --- a/cmd/actionExecute.go +++ b/cmd/actionExecute.go @@ -98,9 +98,9 @@ func actionExecute( 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 { - log.Fatalf("error executing action: %v", err) + log.Fatalf("error executing %s: %v", action, err) } if diff { diff --git a/core/action.go b/core/action.go index 14238a7..25b537d 100644 --- a/core/action.go +++ b/core/action.go @@ -212,7 +212,6 @@ func Execute( // Execute an action that takes an item as input and returns the item modified. func ExecuteItemAction( item Item, - action string, argv []string, env []string, statePath string, @@ -225,7 +224,7 @@ func ExecuteItemAction( res, err := Execute(item.Source, argv, env, statePath, string(itemJson), timeout) 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 { return Item{}, fmt.Errorf("expected action to produce exactly one item, got %d", len(res)) diff --git a/core/source.go b/core/source.go index 232aed1..dd4fcc5 100644 --- a/core/source.go +++ b/core/source.go @@ -284,9 +284,9 @@ func UpdateWithFetchedItems(db *DB, source string, items []Item) (int, int, erro if err == nil { var updatedNewItems []Item 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 { - log.Printf("error: %v", err) + log.Printf("error: on_create failed for %s/%s: %v", item.Source, item.Id, err) } updatedNewItems = append(updatedNewItems, updatedItem) } diff --git a/web/item.go b/web/item.go index 1c4d45c..1b44c3f 100644 --- a/web/item.go +++ b/web/item.go @@ -61,7 +61,7 @@ func (env *Env) doAction(writer http.ResponseWriter, req *http.Request) { return } - newItem, err := core.ExecuteItemAction(item, action, argv, nil, "", time.Minute) + newItem, err := core.ExecuteItemAction(item, argv, nil, "", time.Minute) if err != nil { http.Error(writer, err.Error(), 500) return