removed early return on error when checking dispenser status in the start and final loops

This commit is contained in:
Yurii 2026-03-20 20:46:21 +00:00
parent 8f093159cd
commit c6c2b40f37
3 changed files with 9 additions and 11 deletions

View File

@ -301,16 +301,14 @@ func (c *Client) DispenserStart(ctx context.Context) (string, error) {
for { for {
time.Sleep(delay * 2) time.Sleep(delay * 2)
if time.Now().After(deadline) { 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) status, _ = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, fmt.Errorf("[%s] re-check status: %w", funcName, err)
}
stockStatus = stockTake(status) stockStatus = stockTake(status)
c.setStock(status) c.setStock(status)
logStatus(status)
// error states first // error states first
if isCardWellEmpty(status) { if isCardWellEmpty(status) {
@ -355,17 +353,14 @@ func (c *Client) DispenserFinal(ctx context.Context) (string, error) {
return stockStatus, nil return stockStatus, nil
} }
status, err = c.do(ctx, cmdStatus) status, _ = c.do(ctx, cmdStatus)
if err != nil {
return stockStatus, nil
}
stockStatus = stockTake(status) stockStatus = stockTake(status)
c.setStock(status) c.setStock(status)
logStatus(status) logStatus(status)
if isCardWellEmpty(status) { if isCardWellEmpty(status) {
return stockStatus, fmt.Errorf(stockStatus) return stockStatus, nil
} }
if isAtEncoderPosition(status) { if isAtEncoderPosition(status) {

View File

@ -29,7 +29,7 @@ import (
) )
const ( const (
buildVersion = "1.2.4" buildVersion = "1.2.5"
serviceName = "hardlink" serviceName = "hardlink"
pollingFrequency = 8 * time.Second pollingFrequency = 8 * time.Second
) )

View File

@ -2,6 +2,9 @@
builtVersion is a const in main.go 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 #### 1.2.4 - 18 March 2026
added check if keycard at the encoder position before trying to encode key added check if keycard at the encoder position before trying to encode key