cleanup logsloglevel2Level -> level.go

hedzr · Nov 17, 2024 · 7bef575 · 7bef575
1 parent ecb875e
commit 7bef575
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 35 deletions.
diff --git a/slog/entry.go b/slog/entry.go
@@ -929,41 +929,6 @@ func (s *Entry) Errorf(format string, a ...interface{}) error {
 	return nil
 }
 
-const (
-	LevelVerbose = logslog.Level(-16)
-	LevelTrace   = logslog.Level(-8)
-	LevelNotice  = logslog.Level(2)
-	LevelHint    = logslog.Level(3)
-	LevelFatal   = logslog.Level(16)
-	LevelPanic   = logslog.Level(17)
-)
-
-func logsloglevel2Level(level logslog.Level) Level {
-	switch level {
-	case logslog.LevelDebug:
-		return DebugLevel
-	case logslog.LevelInfo:
-		return InfoLevel
-	case logslog.LevelWarn:
-		return WarnLevel
-	case logslog.LevelError:
-		return ErrorLevel
-	case LevelVerbose:
-		return TraceLevel
-	case LevelTrace:
-		return TraceLevel
-	case LevelNotice:
-		return InfoLevel
-	case LevelHint:
-		return InfoLevel
-	case LevelFatal:
-		return FatalLevel
-	case LevelPanic:
-		return PanicLevel
-	}
-	return FatalLevel
-}
-
 //
 
 //

diff --git a/slog/level.go b/slog/level.go
@@ -299,6 +299,32 @@ func SetLevelColors(lvl Level, fg, bg color.Color) {
 	mLevelColors[lvl] = []color.Color{fg, bg}
 }
 
+func logsloglevel2Level(level logslog.Level) Level {
+	switch level {
+	case logslog.LevelDebug:
+		return DebugLevel
+	case logslog.LevelInfo:
+		return InfoLevel
+	case logslog.LevelWarn:
+		return WarnLevel
+	case logslog.LevelError:
+		return ErrorLevel
+	case LevelVerbose:
+		return TraceLevel
+	case LevelTrace:
+		return TraceLevel
+	case LevelNotice:
+		return InfoLevel
+	case LevelHint:
+		return InfoLevel
+	case LevelFatal:
+		return FatalLevel
+	case LevelPanic:
+		return PanicLevel
+	}
+	return FatalLevel
+}
+
 // mLevelIsEnabledAs is a replacement table of two levels.
 //
 // The given level is treated as another one (generally
@@ -435,6 +461,15 @@ var allLevels = []Level{
 	FailLevel,
 }
 
+const (
+	LevelVerbose = logslog.Level(-16)
+	LevelTrace   = logslog.Level(-8)
+	LevelNotice  = logslog.Level(2)
+	LevelHint    = logslog.Level(3)
+	LevelFatal   = logslog.Level(16)
+	LevelPanic   = logslog.Level(17)
+)
+
 const (
 
 	// PanicLevel level, highest level of severity. Logs and then calls panic with the