Skip to content

Commit

Permalink
fix spellings
Browse files Browse the repository at this point in the history
Signed-off-by: yanggang <gang.yang@daocloud.io>
  • Loading branch information
yanggang committed May 5, 2023
1 parent 1c20ffa commit 2edbdd2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pkg/kwok/server/debugging_logs.go
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ func waitLogs(ctx context.Context, watcher *fsnotify.Watcher) (bool, bool, error
for {
select {
case <-ctx.Done():
return false, false, fmt.Errorf("context cancelled")
return false, false, fmt.Errorf("context canceled")
case e := <-watcher.Events:
switch e.Op {
case fsnotify.Write:
Expand Down
12 changes: 6 additions & 6 deletions pkg/log/logger_ctl.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (c *ctlHandler) Handle(r slog.Record) error {
if attrsStr == "" {
if r.Level != slog.InfoLevel {
levelStr := r.Level.String()
c, ok := levelColour[strings.SplitN(levelStr, "+", 2)[0]]
c, ok := levelColor[strings.SplitN(levelStr, "+", 2)[0]]
if ok {
msg = c.renderer + " " + msg
}
Expand All @@ -123,7 +123,7 @@ func (c *ctlHandler) Handle(r slog.Record) error {
msgWidth := stringWidth(msg)
if r.Level != slog.InfoLevel {
levelStr := r.Level.String()
c, ok := levelColour[strings.SplitN(levelStr, "+", 2)[0]]
c, ok := levelColor[strings.SplitN(levelStr, "+", 2)[0]]
if ok {
msg = c.renderer + " " + msg
msgWidth += c.width + 1
Expand All @@ -139,19 +139,19 @@ func (c *ctlHandler) Handle(r slog.Record) error {
return err
}

type colour struct {
type color struct {
renderer string
width int
}

func newColour(c ctc.Color, msg string) colour {
return colour{
func newColour(c ctc.Color, msg string) color {
return color{
renderer: fmt.Sprintf("%s%s%s", c, msg, ctc.Reset),
width: stringWidth(msg),
}
}

var levelColour = map[string]colour{
var levelColor = map[string]color{
slog.ErrorLevel.String(): newColour(ctc.ForegroundRed, slog.ErrorLevel.String()),
slog.WarnLevel.String(): newColour(ctc.ForegroundYellow, slog.WarnLevel.String()),
slog.DebugLevel.String(): newColour(ctc.ForegroundCyan, slog.DebugLevel.String()),
Expand Down

0 comments on commit 2edbdd2

Please sign in to comment.