Fix io.Reader implementations and wrap more errors

[rbdr/mobius] / hotline / client_conn.go

diff --git a/hotline/client_conn.go b/hotline/client_conn.go
index 8e6621864edc07a13fd2091c988f0a791c30c2ea..c886dfcc712e88eed55b99dc3a80c2d22aced448 100644 (file)
--- a/hotline/client_conn.go
+++ b/hotline/client_conn.go
@@ -81,7 +81,7 @@ func (cc *ClientConn) handleTransaction(transaction Transaction) error {
 
                transactions, err := handler.Handler(cc, &transaction)
                if err != nil {
-                       return err
+                       return fmt.Errorf("error handling transaction: %w", err)
                }
                for _, t := range transactions {
                        cc.Server.outbox <- t
@@ -167,7 +167,6 @@ 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 {
        return Transaction{
-               Flags:     0x00,
                IsReply:   0x01,
                Type:      []byte{0x00, 0x00},
                ID:        t.ID,
@@ -181,7 +180,6 @@ func (cc *ClientConn) NewReply(t *Transaction, fields ...Field) Transaction {
 func (cc *ClientConn) NewErrReply(t *Transaction, errMsg string) Transaction {
        return Transaction{
                clientID:  cc.ID,
-               Flags:     0x00,
                IsReply:   0x01,
                Type:      []byte{0, 0},
                ID:        t.ID,