Compare commits

...

2 commits

Author SHA1 Message Date
46407b3685 Implement write canceling in COBSFramer 2022-12-03 13:33:37 +01:00
cd01f07007 Fix grammar 2022-12-03 13:15:58 +01:00
2 changed files with 27 additions and 5 deletions

View file

@ -71,7 +71,7 @@ func (h *Handler) Run(ctx context.Context) error {
defer func() {
cancel()
h.logger.Info("context canceled waiting for shutdown of components")
h.logger.Info("context canceled, waiting for shutdown of components")
wg.Wait()
h.logger.Info("shutdown complete")
}()

View file

@ -510,12 +510,34 @@ func (c *COBSFramer) WriteFrames(ctx context.Context, writer io.Writer, frameCha
encoded := c.encoder.Encode(frame)
n, err := io.Copy(writer, bytes.NewReader(encoded))
err := c.writeRaw(ctx, writer, encoded)
if err != nil {
return fmt.Errorf("cold not write data: %w", err)
return err
}
c.logger.Tracef("wrote %d bytes", n)
}
}
}
func (c *COBSFramer) writeRaw(ctx context.Context, writer io.Writer, raw []byte) error {
errChan := make(chan error)
go func() {
n, err := io.Copy(writer, bytes.NewReader(raw))
if err != nil {
errChan <- fmt.Errorf("could not write data: %w", err)
return
}
c.logger.WithField("count", n).Tracef("wrote bytes")
close(errChan)
}()
select {
case <-ctx.Done():
return nil
case err := <-errChan:
return err
}
}