diff --git a/dispenser/dispenserclient.go b/dispenser/dispenserclient.go index f7dc331..39d8b75 100644 --- a/dispenser/dispenserclient.go +++ b/dispenser/dispenserclient.go @@ -301,16 +301,14 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) { for { time.Sleep(delay * 2) if time.Now().After(deadline) { - return stockStatus, fmt.Errorf("[%s] timeout waiting keycard at encoder position", funcName) + return stockStatus, nil } - status, err = c.do(ctx, cmdStatus) - if err != nil { - return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err) - } + status, _ = c.do(ctx, cmdStatus) stockStatus = stockTake(status) c.setStock(status) + logStatus(status) // error states first if isCardWellEmpty(status) { @@ -355,17 +353,14 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) { return stockStatus, nil } - status, err = c.do(ctx, cmdStatus) - if err != nil { - return stockStatus, nil - } + status, _ = c.do(ctx, cmdStatus) stockStatus = stockTake(status) c.setStock(status) logStatus(status) if isCardWellEmpty(status) { - return stockStatus, fmt.Errorf(stockStatus) + return stockStatus, nil } if isAtEncoderPosition(status) { diff --git a/main.go b/main.go index a7e65cd..64408bf 100644 --- a/main.go +++ b/main.go @@ -29,7 +29,7 @@ import ( ) const ( - buildVersion = "1.2.4" + buildVersion = "1.2.5" serviceName = "hardlink" pollingFrequency = 8 * time.Second ) diff --git a/release notes.md b/release notes.md index ec41352..5820337 100644 --- a/release notes.md +++ b/release notes.md @@ -2,6 +2,9 @@ builtVersion is a const in main.go +#### 1.2.5 - 20 March 2026 +removed early return on error when checking dispenser status in the start and final loops. + #### 1.2.4 - 18 March 2026 added check if keycard at the encoder position before trying to encode key