Merge branch 'main' of git-ssh.tornberg.me:mats/go-cart-actor into test/net-pool
This commit is contained in:
@@ -180,7 +180,7 @@ func (l *GenericListener) HandleConnection(conn net.Conn) {
|
||||
case frame := <-ch:
|
||||
err := l.HandleFrame(conn, &frame)
|
||||
if err != nil {
|
||||
log.Fatalf("Error handling frame: %v\n", err)
|
||||
log.Fatalf("Error in handler: %v\n", err)
|
||||
}
|
||||
case <-time.After(MaxCallDuration):
|
||||
close(ch)
|
||||
@@ -200,7 +200,8 @@ func (l *GenericListener) HandleFrame(conn net.Conn, frame *FrameWithPayload) er
|
||||
defer close(resultChan)
|
||||
err := handler(frame, resultChan)
|
||||
if err != nil {
|
||||
log.Fatalf("Error handling frame: %s\n", err)
|
||||
resultChan <- MakeFrameWithPayload(frame.Type, 500, []byte(err.Error()))
|
||||
log.Printf("Handler returned error: %s", err)
|
||||
}
|
||||
result := <-resultChan
|
||||
err = SendFrame(conn, &result)
|
||||
|
||||
Reference in New Issue
Block a user