diff options
author | Jesse Duffield <jessedduffield@gmail.com> | 2022-05-07 15:23:08 +1000 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-05-07 16:02:04 +1000 |
commit | cd5b041b0f8b95b473849d222b71aa2fe3b24899 (patch) | |
tree | 87b6610fa4fcbee10390966d47d1adac5e60618f /main.go | |
parent | cf80978f15a60f8edd64990e24224a8f69707869 (diff) |
clearer separation of concerns when bootstrapping application
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -8,12 +8,12 @@ import ( "path/filepath" "runtime" - "github.com/go-errors/errors" "github.com/integrii/flaggy" "github.com/jesseduffield/lazygit/pkg/app" + "github.com/jesseduffield/lazygit/pkg/app/daemon" "github.com/jesseduffield/lazygit/pkg/config" - "github.com/jesseduffield/lazygit/pkg/constants" "github.com/jesseduffield/lazygit/pkg/env" + "github.com/jesseduffield/lazygit/pkg/logs" yaml "github.com/jesseduffield/yaml" ) @@ -117,7 +117,7 @@ func main() { } if logFlag { - app.TailLogs() + logs.TailLogs() os.Exit(0) } @@ -138,20 +138,15 @@ func main() { log.Fatal(err.Error()) } - app, err := app.NewApp(appConfig) - - if err == nil { - err = app.Run(filterPath) - } - + common, err := app.NewCommon(appConfig) if err != nil { - if errorMessage, known := app.KnownError(err); known { - log.Fatal(errorMessage) - } - newErr := errors.Wrap(err, 0) - stackTrace := newErr.ErrorStack() - app.Log.Error(stackTrace) + log.Fatal(err) + } - log.Fatal(fmt.Sprintf("%s: %s\n\n%s", app.Tr.ErrorOccurred, constants.Links.Issues, stackTrace)) + if daemon.InDaemonMode() { + daemon.Handle(common) + return } + + app.Run(appConfig, common, filterPath) } |