Compare commits

...
2 Commits
Author SHA1 Message Date
Yurii 7993a2360d added testmode to config file 2025-11-12 13:14:56 +00:00
Yurii c15ceba78f increased timeout for Salto lock server connection to 40 seconds 2025-10-20 19:41:07 +02:00
3 changed files with 26 additions and 20 deletions
+2 -2
View File
@@ -140,7 +140,7 @@ func (lock *SaltoLockServer) waitForAck(conn net.Conn, reader *bufio.Reader, tim
// LockSequence performs the full ENQ/ACK handshake and command exchange // LockSequence performs the full ENQ/ACK handshake and command exchange
func (lock *SaltoLockServer) LockSequence() error { func (lock *SaltoLockServer) LockSequence() error {
const timeout = 10 * time.Second const timeout = 20 * time.Second
var ( var (
resp []byte resp []byte
drained = 0 // count of stale frames consumed across waits drained = 0 // count of stale frames consumed across waits
@@ -178,7 +178,7 @@ func (lock *SaltoLockServer) LockSequence() error {
// 5. Now read the *next* STX frame which should be the response to our command. // 5. Now read the *next* STX frame which should be the response to our command.
for { for {
conn.SetReadDeadline(time.Now().Add(20 * time.Second)) conn.SetReadDeadline(time.Now().Add(40 * time.Second))
b, e := reader.ReadByte() b, e := reader.ReadByte()
if e != nil { if e != nil {
return fmt.Errorf("error reading response start: %w", e) return fmt.Errorf("error reading response start: %w", e)
+21 -18
View File
@@ -29,7 +29,7 @@ import (
) )
const ( const (
buildVersion = "1.0.20" buildVersion = "1.0.21"
serviceName = "hardlink" serviceName = "hardlink"
customLayout = "2006-01-02 15:04:05 -0700" customLayout = "2006-01-02 15:04:05 -0700"
transactionUrl = "http://127.0.0.1:18181/start-transaction/" transactionUrl = "http://127.0.0.1:18181/start-transaction/"
@@ -47,6 +47,7 @@ type configRec struct {
PrinterName string `yaml:"printerName"` PrinterName string `yaml:"printerName"`
LogDir string `yaml:"logdir"` LogDir string `yaml:"logdir"`
IsPayment bool `yaml:"isPayment"` IsPayment bool `yaml:"isPayment"`
TestMode bool `yaml:"testMode"`
} }
// App holds shared resources. // App holds shared resources.
@@ -71,6 +72,7 @@ func main() {
printer.PrinterName = config.PrinterName printer.PrinterName = config.PrinterName
lockserver.Cert = config.Cert lockserver.Cert = config.Cert
lockserver.LockServerURL = config.LockserverUrl lockserver.LockServerURL = config.LockserverUrl
dispHandle := &serial.Port{}
// Setup logging and get file handle // Setup logging and get file handle
logFile, err := setupLogging(config.LogDir) logFile, err := setupLogging(config.LogDir)
@@ -80,25 +82,27 @@ func main() {
defer logFile.Close() defer logFile.Close()
// Initialize dispenser // Initialize dispenser
dispenser.SerialPort = config.DispenserPort if !config.TestMode {
dispenser.Address = []byte(config.DispenserAdrr) dispenser.SerialPort = config.DispenserPort
dispHandle, err := dispenser.InitializeDispenser() dispenser.Address = []byte(config.DispenserAdrr)
if err != nil { dispHandle, err = dispenser.InitializeDispenser()
fatalError(err) if err != nil {
}
defer dispHandle.Close()
status, err := dispenser.CheckDispenserStatus(dispHandle)
if err != nil {
if len(status) == 0 {
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
fatalError(err) fatalError(err)
} else {
fmt.Println(status)
fmt.Println(err.Error())
} }
defer dispHandle.Close()
status, err := dispenser.CheckDispenserStatus(dispHandle)
if err != nil {
if len(status) == 0 {
err = fmt.Errorf("%s; wrong dispenser address: %s", err, config.DispenserAdrr)
fatalError(err)
} else {
fmt.Println(status)
fmt.Println(err.Error())
}
}
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
} }
log.Infof("Dispenser initialized on port %s, %s", config.DispenserPort, status)
// Test lock-server connection // Test lock-server connection
switch strings.ToLower(config.LockType) { switch strings.ToLower(config.LockType) {
@@ -126,7 +130,6 @@ func main() {
} }
// Create App and wire routes // Create App and wire routes
// dispHandle := &serial.Port{} // Placeholder, replace with actual dispenser handle
app := newApp(dispHandle, config) app := newApp(dispHandle, config)
mux := http.NewServeMux() mux := http.NewServeMux()
+3
View File
@@ -2,6 +2,9 @@
builtVersion is a const in main.go builtVersion is a const in main.go
#### 1.0.21 - 20 October 2025
increased timeout for Salto lock server connection to 40 seconds
#### 1.0.20 - 06 October 2025 #### 1.0.20 - 06 October 2025
removed minutes from the start and expiry time in Salto lock command removed minutes from the start and expiry time in Salto lock command