From 95159e5585762c06c654945070ba54262b7dcec9 Mon Sep 17 00:00:00 2001 From: Jeff Halter <868228+jhalter@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:13:16 -0700 Subject: Refactoring and cleanup * Split CLI client into separate project * Convert more functions to follow common Golang idioms e.g io.Reader, io.Writer * Use ldflags for versioning * Misc cleanup and simplification --- hotline/client_conn.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'hotline/client_conn.go') diff --git a/hotline/client_conn.go b/hotline/client_conn.go index f73265d..8e66218 100644 --- a/hotline/client_conn.go +++ b/hotline/client_conn.go @@ -60,7 +60,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error { field := transaction.GetField(reqField.ID) // Validate that required field is present - if field.ID == nil { + if field.ID == [2]byte{0, 0} { cc.logger.Error( "Missing required field", "RequestType", handler.Name, "FieldID", reqField.ID, @@ -166,7 +166,7 @@ func (cc *ClientConn) notifyOthers(t Transaction) (trans []Transaction) { // NewReply returns a reply Transaction with fields for the ClientConn func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction { - reply := Transaction{ + return Transaction{ Flags: 0x00, IsReply: 0x01, Type: []byte{0x00, 0x00}, @@ -175,8 +175,6 @@ func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction { ErrorCode: []byte{0, 0, 0, 0}, Fields: fields, } - - return reply } // NewErrReply returns an error reply Transaction with errMsg -- cgit