summaryrefslogtreecommitdiffstats
path: root/pkg/app
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2020-10-03 14:54:55 +1000
committerJesse Duffield <jessedduffield@gmail.com>2020-10-10 00:23:01 +1100
commit4912205adb5e8e245b33b8e0d5581bcf0ec37e8a (patch)
tree90e28657c0af72cd0a880842f88750c01a32834d /pkg/app
parent9440dcf9de3214927125693e512cdc941ca4e123 (diff)
remove viper
WIP
Diffstat (limited to 'pkg/app')
-rw-r--r--pkg/app/app.go21
1 files changed, 14 insertions, 7 deletions
diff --git a/pkg/app/app.go b/pkg/app/app.go
index d41f208d7..fd8950ae7 100644
--- a/pkg/app/app.go
+++ b/pkg/app/app.go
@@ -61,14 +61,18 @@ func getLogLevel() logrus.Level {
}
func newDevelopmentLogger(configurer config.AppConfigurer) *logrus.Logger {
- log := logrus.New()
- log.SetLevel(getLogLevel())
- file, err := os.OpenFile(config.LogPath(), os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
+ logger := logrus.New()
+ logger.SetLevel(getLogLevel())
+ logPath, err := config.LogPath()
+ if err != nil {
+ log.Fatal(err)
+ }
+ file, err := os.OpenFile(logPath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
if err != nil {
panic("unable to log to file") // TODO: don't panic (also, remove this call to the `panic` function)
}
- log.SetOutput(file)
- return log
+ logger.SetOutput(file)
+ return logger
}
func newLogger(config config.AppConfigurer) *logrus.Entry {
@@ -295,11 +299,14 @@ func (app *App) KnownError(err error) (string, bool) {
}
func TailLogs() {
- logFilePath := config.LogPath()
+ logFilePath, err := config.LogPath()
+ if err != nil {
+ log.Fatal(err)
+ }
fmt.Printf("Tailing log file %s\n\n", logFilePath)
- _, err := os.Stat(logFilePath)
+ _, err = os.Stat(logFilePath)
if err != nil {
if os.IsNotExist(err) {
log.Fatal("Log file does not exist. Run `lazygit --debug` first to create the log file")