From 8690419c2d577a27efe3cfcafc39c05b7646926b Mon Sep 17 00:00:00 2001 From: Ophestra Date: Mon, 15 Sep 2025 01:44:43 +0900 Subject: hst: replace internal/app error This turns out to still be quite useful across internal/app and its relatives. Perhaps a cleaner replacement for baseError. Signed-off-by: Ophestra --- internal/app/process.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'internal/app/process.go') diff --git a/internal/app/process.go b/internal/app/process.go index f67327fd..50d5dc83 100644 --- a/internal/app/process.go +++ b/internal/app/process.go @@ -13,6 +13,7 @@ import ( "time" "hakurei.app/container" + "hakurei.app/hst" "hakurei.app/internal" "hakurei.app/internal/app/state" "hakurei.app/internal/hlog" @@ -119,7 +120,7 @@ func (seal *Outcome) Run(rs *RunState) error { var e *gob.Encoder if fd, encoder, err := container.Setup(&cmd.ExtraFiles); err != nil { - return &FinaliseError{Step: "create shim setup pipe", Err: err} + return &hst.AppError{Step: "create shim setup pipe", Err: err} } else { e = encoder cmd.Env = []string{ @@ -139,7 +140,7 @@ func (seal *Outcome) Run(rs *RunState) error { hlog.Verbosef("setuid helper at %s", hsuPath) hlog.Suspend() if err := cmd.Start(); err != nil { - return &FinaliseError{Step: "start setuid wrapper", Err: err} + return &hst.AppError{Step: "start setuid wrapper", Err: err} } rs.setStart() @@ -159,7 +160,7 @@ func (seal *Outcome) Run(rs *RunState) error { case err := <-setupErr: if err != nil { hlog.Resume() - return &FinaliseError{Step: "transmit shim config", Err: err} + return &hst.AppError{Step: "transmit shim config", Err: err} } case <-ctx.Done(): -- cgit v1.3.1