Skip to content

Commit ba221ff

Browse files
authored
check chrome failure type (#678)
* check chrome failure type * avoid unknown * fix imports
1 parent 8fcd028 commit ba221ff

File tree

3 files changed

+16
-5
lines changed

3 files changed

+16
-5
lines changed

pkg/errors/errors.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,10 @@ var (
104104
ErrShuttingDown = psrpc.NewErrorf(psrpc.Unavailable, "server is shutting down")
105105
)
106106

107+
func ErrPageLoadFailed(err string) error {
108+
return psrpc.NewErrorf(psrpc.InvalidArgument, "template page load failed: %s", err)
109+
}
110+
107111
func ErrCouldNotParseConfig(err error) error {
108112
return psrpc.NewErrorf(psrpc.InvalidArgument, "could not parse config: %v", err)
109113
}

pkg/info/info.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ func (e *EgressInfo) SetFailed(err error) {
4949
e.Error = err.Error()
5050
var perr psrpc.Error
5151
if errors.As(err, &perr) {
52-
e.ErrorCode = int32(perr.ToHttp())
53-
} else {
54-
e.ErrorCode = int32(http.StatusInternalServerError)
52+
// unknown is treated the same as an internal error (500)
53+
if !errors.Is(perr.Code(), psrpc.Unknown) {
54+
e.ErrorCode = int32(perr.ToHttp())
55+
}
5556
}
5657
}
5758

pkg/pipeline/source/web.go

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ import (
3838
const (
3939
startRecordingLog = "START_RECORDING"
4040
endRecordingLog = "END_RECORDING"
41+
42+
chromeFailedToStart = "chrome failed to start:"
4143
)
4244

4345
type WebSource struct {
@@ -314,11 +316,15 @@ func (s *WebSource) launchChrome(ctx context.Context, p *config.PipelineConfig,
314316
),
315317
)
316318
if err != nil {
317-
return errors.ErrProcessStartFailed(err)
319+
if strings.HasPrefix(err.Error(), chromeFailedToStart) {
320+
return errors.ErrProcessStartFailed(err)
321+
}
322+
errString = err.Error()
318323
}
319324
if errString != "" {
320-
return errors.New(errString)
325+
return errors.ErrPageLoadFailed(errString)
321326
}
327+
322328
return nil
323329
}
324330

0 commit comments

Comments
 (0)