forked from carvel-dev/kapp
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
31328bb
commit c82624f
Showing
14 changed files
with
185 additions
and
67 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| cmdcore "github.com/k14s/kapp/pkg/kapp/cmd/core" | ||
| "github.com/k14s/kapp/pkg/kapp/logger" | ||
| "github.com/spf13/cobra" | ||
| ) | ||
|
|
||
| type LoggerFlags struct { | ||
| Debug bool | ||
| } | ||
|
|
||
| func (f *LoggerFlags) Set(cmd *cobra.Command, flagsFactory cmdcore.FlagsFactory) { | ||
| cmd.PersistentFlags().BoolVar(&f.Debug, "debug", false, "Include debug output") | ||
| } | ||
|
|
||
| func (f *LoggerFlags) Configure(logger *logger.UILogger) { | ||
| logger.SetDebug(f.Debug) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package logger | ||
|
|
||
| type Logger interface { | ||
| DebugFunc(name string) FuncLogger | ||
| NewPrefixed(name string) Logger | ||
|
|
||
| Error(msg string, args ...interface{}) | ||
| Info(msg string, args ...interface{}) | ||
| Debug(msg string, args ...interface{}) | ||
| } | ||
|
|
||
| type FuncLogger interface { | ||
| Finish() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| package logger | ||
|
|
||
| type NoopLogger struct{} | ||
|
|
||
| var _ Logger = NoopLogger{} | ||
|
|
||
| func NewNoopLogger() NoopLogger { return NoopLogger{} } | ||
| func NewTODOLogger() NoopLogger { return NewNoopLogger() } | ||
|
|
||
| func (l NoopLogger) Error(msg string, args ...interface{}) {} | ||
| func (l NoopLogger) Info(msg string, args ...interface{}) {} | ||
| func (l NoopLogger) Debug(msg string, args ...interface{}) {} | ||
| func (l NoopLogger) DebugFunc(name string) FuncLogger { return NoopFuncLogger{} } | ||
| func (l NoopLogger) NewPrefixed(name string) Logger { return l } | ||
|
|
||
| type NoopFuncLogger struct{} | ||
|
|
||
| var _ FuncLogger = NoopFuncLogger{} | ||
|
|
||
| func (l NoopFuncLogger) Finish() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| package logger | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "time" | ||
|
|
||
| "github.com/cppforlife/go-cli-ui/ui" | ||
| ) | ||
|
|
||
| const ( | ||
| loggerLevelError = "error" | ||
| loggerLevelInfo = "info" | ||
| loggerLevelDebug = "debug" | ||
| ) | ||
|
|
||
| type UILogger struct { | ||
| prefix string | ||
| ui ui.UI | ||
| debug bool | ||
| } | ||
|
|
||
| var _ Logger = &UILogger{} | ||
|
|
||
| func NewUILogger(ui ui.UI) *UILogger { return &UILogger{"", ui, false} } | ||
|
|
||
| func (l *UILogger) SetDebug(debug bool) { l.debug = debug } | ||
|
|
||
| func (l *UILogger) Error(msg string, args ...interface{}) { | ||
| l.ui.BeginLinef(l.msg(loggerLevelDebug, msg), args...) | ||
| } | ||
|
|
||
| func (l *UILogger) Info(msg string, args ...interface{}) { | ||
| l.ui.BeginLinef(l.msg(loggerLevelDebug, msg), args...) | ||
| } | ||
|
|
||
| func (l *UILogger) Debug(msg string, args ...interface{}) { | ||
| if l.debug { | ||
| l.ui.BeginLinef(l.msg(loggerLevelDebug, msg), args...) | ||
| } | ||
| } | ||
|
|
||
| func (l *UILogger) DebugFunc(name string) FuncLogger { | ||
| funcLogger := &UIFuncLogger{name, l.NewPrefixed(name)} | ||
| funcLogger.Start() | ||
| return funcLogger | ||
| } | ||
|
|
||
| func (l *UILogger) NewPrefixed(name string) Logger { | ||
| if len(l.prefix) > 0 { | ||
| name = l.prefix + name | ||
| } | ||
| name += ": " | ||
| return &UILogger{name, l.ui, l.debug} | ||
| } | ||
|
|
||
| func (l *UILogger) msg(level, msg string) string { | ||
| ts := time.Now().Format("03:04:05PM") | ||
| return fmt.Sprintf("%s: %s: %s%s\n", ts, level, l.prefix, msg) | ||
| } | ||
|
|
||
| type UIFuncLogger struct { | ||
| name string | ||
| logger Logger | ||
| } | ||
|
|
||
| var _ FuncLogger = &UIFuncLogger{} | ||
|
|
||
| func (l *UIFuncLogger) Start() { l.logger.Debug("start") } | ||
| func (l *UIFuncLogger) Finish() { l.logger.Debug("end") } |
Oops, something went wrong.