add stop and graceful stop worker to cli

Author: siherrmann

README.md

@@ -14,7 +14,7 @@ The job table contains only queued, scheduled and running tasks. The ended jobs
 
 ---
 
-# 🛠️ Installation
+## 🛠️ Installation
 
 To integrate the queuer package into your Go project, use the standard go get command:
 

cli/cmd/cancel/cancelWorker.go

@@ -13,6 +13,7 @@ type WorkerCommand struct {
 	Cmd         *cobra.Command
 	RootFlags   *model.RootFlags
 	CancelFlags *CancelFlags
+	Graceful    bool
 }
 
 func AddWorkerCommand(cmd *cobra.Command, cancelFlags *CancelFlags, rootFlags *model.RootFlags) {
@@ -23,20 +24,21 @@ func AddWorkerCommand(cmd *cobra.Command, cancelFlags *CancelFlags, rootFlags *m
 			Long: `Cancel/shut down a worker using its RID (Resource ID).
 
 This command will:
-- Signal the worker to stop accepting new jobs
-- Allow currently running jobs to complete
+- Allow currently running jobs to complete with graceful shutdown
 - Shut down the worker process
-- Update the worker status to offline
-- Cancel any jobs assigned to this worker that haven't started`,
+- Signal the worker to stop accepting new jobs`,
 			Example: helper.FormatCmdExamples("cancel worker", []helper.CmdExample{
 				{Cmd: `--rid "123e4567-e89b-12d3-a456-426614174000"`, Description: "Cancel worker by RID"},
+				{Cmd: `--rid "123e4567-e89b-12d3-a456-426614174000" --graceful`, Description: "Gracefully cancel worker by RID allowing current jobs to complete"},
 			}),
 		},
 		RootFlags:   rootFlags,
 		CancelFlags: cancelFlags,
 	}
 	workerCmd.Cmd.Run = workerCmd.RunWorkerCommand
 
+	workerCmd.Cmd.PersistentFlags().BoolVarP(&workerCmd.Graceful, "graceful", "g", false, "Allow currently running jobs to complete with graceful shutdown")
+
 	cmd.AddCommand(workerCmd.Cmd)
 }
 
@@ -52,39 +54,22 @@ func (r *WorkerCommand) RunWorkerCommand(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	// First, get the worker to verify it exists
-	worker, err := r.RootFlags.QueuerInstance.GetWorker(parsedID)
-	if err != nil {
-		fmt.Printf("Error retrieving worker: %v\n", err)
-		return
-	}
-	if worker == nil {
-		fmt.Printf("No worker found with ID: %s\n", r.CancelFlags.RID)
+	if r.Graceful {
+		err = r.RootFlags.QueuerInstance.StopWorkerGracefully(parsedID)
+		if err != nil {
+			fmt.Printf("Error retrieving worker: %v\n", err)
+			return
+		}
+		fmt.Printf("Successfully initiated graceful shutdown for worker: %s\n", r.CancelFlags.RID)
+		fmt.Println("The worker will finish current jobs before shutting down.")
 		return
 	}
 
-	// Check if worker is already offline
-	if worker.Status == "OFFLINE" {
-		fmt.Printf("Worker %s is already offline\n", r.CancelFlags.RID)
-		return
-	}
-
-	// Cancel all jobs assigned to this worker
-	err = r.RootFlags.QueuerInstance.CancelAllJobsByWorker(parsedID, 100) // Cancel up to 100 jobs
+	err = r.RootFlags.QueuerInstance.StopWorker(parsedID)
 	if err != nil {
-		fmt.Printf("Error cancelling jobs for worker: %v\n", err)
+		fmt.Printf("Error retrieving worker: %v\n", err)
 		return
 	}
-
 	fmt.Printf("Successfully initiated shutdown for worker: %s\n", r.CancelFlags.RID)
-	fmt.Println("All assigned jobs have been cancelled.")
-
-	// Display the worker details
-	helper.PrintTabbedLines([]helper.TabLine{
-		{Key: "ID", Value: worker.ID},
-		{Key: "RID", Value: worker.RID.String()},
-		{Key: "Status", Value: worker.Status},
-		{Key: "Last update", Value: worker.UpdatedAt.Format("2006-01-02 15:04:05")},
-		{Key: "Created", Value: worker.CreatedAt.Format("2006-01-02 15:04:05")},
-	})
+	fmt.Println("All assigned jobs will be cancelled.")
 }