update

tsurdilo · tsurdilo · commit 5d2ecfe39b35 · 2023-05-11T16:59:46.000-04:00
Signed-off-by: Tihomir Surdilovic &lt;tihomir@temporal.io&gt;
diff --git a/cancellation/activity.go b/cancellation/activity.go
@@ -21,7 +21,7 @@ func (a *Activities) ActivityToBeCanceled(ctx context.Context) (string, error) {
 			activity.RecordHeartbeat(ctx, "")
 		case <-ctx.Done():
 			logger.Info("context is cancelled")
-			return "I am canceled by Done", ctx.Err()
+			return "", ctx.Err()
 		}
 	}
 }
diff --git a/cancellation/workflow.go b/cancellation/workflow.go
@@ -2,7 +2,6 @@ package cancellation
 
 import (
 	"errors"
-	"fmt"
 	"go.temporal.io/sdk/workflow"
 	"time"
 )
@@ -39,7 +38,6 @@ func YourWorkflow(ctx workflow.Context) error {
 	if err != nil {
 		return err
 	}
-	logger.Info(fmt.Sprintf("ActivityToBeCanceled returns %v, %v", result, err))
 
 	err = workflow.ExecuteActivity(ctx, a.ActivityToBeSkipped).Get(ctx, nil)
 	logger.Error("Error from ActivityToBeSkipped", "Error", err)

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func (a *Activities) ActivityToBeCanceled(ctx context.Context) (string, error) {`
`21`	`21`	`activity.RecordHeartbeat(ctx, "")`
`22`	`22`	`case <-ctx.Done():`
`23`	`23`	`logger.Info("context is cancelled")`
`24`		`- return "I am canceled by Done", ctx.Err()`
	`24`	`+ return "", ctx.Err()`
`25`	`25`	`}`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ package cancellation`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"errors"`
`5`		`- "fmt"`
`6`	`5`	`"go.temporal.io/sdk/workflow"`
`7`	`6`	`"time"`
`8`	`7`	`)`
`@@ -39,7 +38,6 @@ func YourWorkflow(ctx workflow.Context) error {`
`39`	`38`	`if err != nil {`
`40`	`39`	`return err`
`41`	`40`	`}`
`42`		`- logger.Info(fmt.Sprintf("ActivityToBeCanceled returns %v, %v", result, err))`
`43`	`41`
`44`	`42`	`err = workflow.ExecuteActivity(ctx, a.ActivityToBeSkipped).Get(ctx, nil)`
`45`	`43`	`logger.Error("Error from ActivityToBeSkipped", "Error", err)`