From ec58ee88eac344a9c3f7f4048dd3063d9385e218 Mon Sep 17 00:00:00 2001 From: Anirudh Oppiliappan Date: Tue, 8 Jul 2025 21:33:03 +0300 Subject: [PATCH] cmd,knotserver: clean up Signed-off-by: Anirudh Oppiliappan --- cmd/eventconsumer/main.go | 50 ----------------------------------- cmd/punchcardPopulate/main.go | 2 +- knotserver/git/git.go | 2 +- 3 files changed, 2 insertions(+), 52 deletions(-) delete mode 100644 cmd/eventconsumer/main.go diff --git a/cmd/eventconsumer/main.go b/cmd/eventconsumer/main.go deleted file mode 100644 index 7da12a8e..00000000 --- a/cmd/eventconsumer/main.go +++ /dev/null @@ -1,50 +0,0 @@ -package main - -import ( - "context" - "flag" - "fmt" - "strings" - "time" - - "tangled.sh/tangled.sh/core/knotclient" -) - -func main() { - knots := flag.String("knots", "", "list of knots to connect to") - retryFlag := flag.Duration("retry", 1*time.Minute, "retry interval") - maxRetryFlag := flag.Duration("max-retry", 30*time.Minute, "max retry interval") - workerCount := flag.Int("workers", 10, "goroutine pool size") - - flag.Parse() - - if *knots == "" { - fmt.Println("error: -knots is required") - flag.Usage() - return - } - - ccfg := knotclient.ConsumerConfig{ - ProcessFunc: processEvent, - RetryInterval: *retryFlag, - MaxRetryInterval: *maxRetryFlag, - WorkerCount: *workerCount, - Dev: true, - } - for k := range strings.SplitSeq(*knots, ",") { - ccfg.AddEventSource(knotclient.NewEventSource(k)) - } - - consumer := knotclient.NewEventConsumer(ccfg) - - ctx, cancel := context.WithCancel(context.Background()) - consumer.Start(ctx) - time.Sleep(1 * time.Hour) - cancel() - consumer.Stop() -} - -func processEvent(_ context.Context, source knotclient.EventSource, msg knotclient.Message) error { - fmt.Printf("From %s (%s, %s): %s\n", source.Knot, msg.Rkey, msg.Nsid, string(msg.EventJson)) - return nil -} diff --git a/cmd/punchcardPopulate/main.go b/cmd/punchcardPopulate/main.go index 21597628..244ddeff 100644 --- a/cmd/punchcardPopulate/main.go +++ b/cmd/punchcardPopulate/main.go @@ -37,7 +37,7 @@ func main() { dateStr := day.Format("2006-01-02") _, err := stmt.Exec(did, dateStr, count) if err != nil { - log.Println("Failed to insert for date %s: %v", dateStr, err) + log.Printf("Failed to insert for date %s: %v", dateStr, err) } } diff --git a/knotserver/git/git.go b/knotserver/git/git.go index 2b8764d6..ace3291d 100644 --- a/knotserver/git/git.go +++ b/knotserver/git/git.go @@ -158,7 +158,7 @@ func (g *GitRepo) TotalCommits() (int, error) { fmt.Sprintf("--count"), ) if err != nil { - return 0, fmt.Errorf("failed to run rev-list", err) + return 0, fmt.Errorf("failed to run rev-list: %w", err) } count, err := strconv.Atoi(strings.TrimSpace(string(output))) -- 2.51.2