Skip to content

headless.Start return error instead of panic & os.Exit #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

headless.Start return error instead of panic & os.Exit #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions internal/pkg/archiver/headless/browser.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"net/http"
"os"
"path"
"time"

Expand Down Expand Up @@ -56,7 +55,7 @@ func queryLatestChromiumRevision(offset int) (int, error) {
return data[0].Revision, nil
}

func Start() {
func Start() error {
var l *launcher.Launcher
if config.Get().HeadlessUserMode {
// In user mode, we use the default launcher
Expand All @@ -69,7 +68,7 @@ func Start() {
latestRev, err := queryLatestChromiumRevision(-config.Get().HeadlessChromiumRevision)
if err != nil {
browserLogger.Error("failed to query latest Chromium revision, you can try to specify the revision manually", "err", err)
os.Exit(1)
return err
}
browserLogger.Info("using Chromium revision", "revision", latestRev, "offset_from_latest", -config.Get().HeadlessChromiumRevision)
config.Get().HeadlessChromiumRevision = latestRev
Expand All @@ -93,8 +92,9 @@ func Start() {
Launcher = l

if HeadlessBrowser.MustVersion().ProtocolVersion != "1.3" {
panic(fmt.Sprintf("Unsupported DevTools-Protocol version: %s, expected 1.3", HeadlessBrowser.MustVersion().ProtocolVersion))
return fmt.Errorf("Unsupported DevTools-Protocol version: %s, expected 1.3", HeadlessBrowser.MustVersion().ProtocolVersion)
}
return nil
}

func Close() {
Expand Down
3 changes: 2 additions & 1 deletion internal/pkg/archiver/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,9 @@ func Start(inputChan, outputChan chan *models.Item) error {
logger.Info("bucket manager started")
}
if config.Get().Headless {
headless.Start()
onceErr = headless.Start()
logger.Info("headless browser started")
return
}

logger.Debug("initialized")
Expand Down
Loading