cmd/mbf: handle flags in serve
All checks were successful
Test / Create distribution (push) Successful in 1m4s
Test / Sandbox (push) Successful in 2m47s
Test / ShareFS (push) Successful in 3m50s
Test / Sandbox (race detector) (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m27s
Test / Hakurei (push) Successful in 2m38s
Test / Flake checks (push) Successful in 1m21s
All checks were successful
Test / Create distribution (push) Successful in 1m4s
Test / Sandbox (push) Successful in 2m47s
Test / ShareFS (push) Successful in 3m50s
Test / Sandbox (race detector) (push) Successful in 5m13s
Test / Hakurei (race detector) (push) Successful in 6m27s
Test / Hakurei (push) Successful in 2m38s
Test / Flake checks (push) Successful in 1m21s
This enables easier expansion of the protocol. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -35,21 +35,10 @@ const (
|
||||
|
||||
// cureFromIR services an IR curing request.
|
||||
func cureFromIR(
|
||||
ctx context.Context,
|
||||
cache *pkg.Cache,
|
||||
conn net.Conn,
|
||||
flags uint64,
|
||||
) (pkg.Artifact, error) {
|
||||
go func() { <-ctx.Done(); _ = conn.SetDeadline(time.Now()) }()
|
||||
if err := conn.SetReadDeadline(daemonDeadline()); err != nil {
|
||||
return nil, errors.Join(err, conn.Close())
|
||||
}
|
||||
|
||||
var flagsWire [8]byte
|
||||
if _, err := io.ReadFull(conn, flagsWire[:]); err != nil {
|
||||
return nil, errors.Join(err, conn.Close())
|
||||
}
|
||||
flags := binary.LittleEndian.Uint64(flagsWire[:])
|
||||
|
||||
a, decodeErr := cache.NewDecoder(conn).Decode()
|
||||
if decodeErr != nil {
|
||||
_, err := conn.Write([]byte("\x00" + decodeErr.Error()))
|
||||
@@ -105,7 +94,26 @@ func serve(
|
||||
continue
|
||||
}
|
||||
wg.Go(func() {
|
||||
if a, _err := cureFromIR(ctx, cm.c, conn); _err != nil {
|
||||
go func() { <-ctx.Done(); _ = conn.SetDeadline(time.Now()) }()
|
||||
if _err := conn.SetReadDeadline(daemonDeadline()); _err != nil {
|
||||
log.Println(_err)
|
||||
if _err = conn.Close(); _err != nil {
|
||||
log.Println(_err)
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
var flagsWire [8]byte
|
||||
if _, _err := io.ReadFull(conn, flagsWire[:]); _err != nil {
|
||||
log.Println(_err)
|
||||
if _err = conn.Close(); _err != nil {
|
||||
log.Println(_err)
|
||||
}
|
||||
return
|
||||
}
|
||||
flags := binary.LittleEndian.Uint64(flagsWire[:])
|
||||
|
||||
if a, _err := cureFromIR(cm.c, conn, flags); _err != nil {
|
||||
log.Println(_err)
|
||||
} else {
|
||||
log.Printf(
|
||||
|
||||
Reference in New Issue
Block a user