Skip to content

Commit

Permalink
style: re-format some code style by gofmt
Browse files Browse the repository at this point in the history
  • Loading branch information
inhere committed Nov 8, 2022
1 parent c17c0a4 commit fb36553
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 27 deletions.
4 changes: 3 additions & 1 deletion handler/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,11 @@ func NewSimpleFile(filepath string) (*SyncCloseHandler, error) {
// NewSimpleFileHandler instance
//
// Usage:
// h, err := NewSimpleFileHandler("/tmp/error.log")
//
// h, err := NewSimpleFileHandler("/tmp/error.log")
//
// custom formatter
//
// h.SetFormatter(slog.NewJSONFormatter())
// slog.PushHandler(h)
// slog.Info("log message")
Expand Down
9 changes: 5 additions & 4 deletions handler/rotate_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ func NewSizeRotateFileHandler(logfile string, maxSize int, fns ...ConfigFn) (*Sy
// RotateTime rotate log file by time.
//
// EveryDay:
// - "error.log.20201223"
// - "error.log.20201223"
//
// EveryHour, Every30Minutes, EveryMinute:
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
//
// Deprecated: please use rotatefile.RotateTime
type RotateTime = rotatefile.RotateTime
Expand Down
7 changes: 4 additions & 3 deletions handler/simple.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ func NewSimple(out io.Writer, level slog.Level) *SimpleHandler {
// NewSimpleHandler create new SimpleHandler
//
// Usage:
// buf := new(bytes.Buffer)
// h := handler.NewSimpleHandler(&buf, slog.InfoLevel)
//
// buf := new(bytes.Buffer)
// h := handler.NewSimpleHandler(&buf, slog.InfoLevel)
//
// f, err := os.OpenFile("my.log", ...)
// h := handler.NewSimpleHandler(f, slog.InfoLevel)
// h := handler.NewSimpleHandler(f, slog.InfoLevel)
func NewSimpleHandler(out io.Writer, level slog.Level) *SimpleHandler {
return &SimpleHandler{
Output: out,
Expand Down
7 changes: 4 additions & 3 deletions handler/write_close_flusher.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ func NewFlushCloser(out FlushCloseWriter, levels []slog.Level) *FlushCloseHandle
// NewFlushCloseHandler create new FlushCloseHandler
//
// Usage:
// buf := new(bytes.Buffer)
// h := handler.NewFlushCloseHandler(&buf, slog.AllLevels)
//
// buf := new(bytes.Buffer)
// h := handler.NewFlushCloseHandler(&buf, slog.AllLevels)
//
// f, err := os.OpenFile("my.log", ...)
// h := handler.NewFlushCloseHandler(f, slog.AllLevels)
// h := handler.NewFlushCloseHandler(f, slog.AllLevels)
func NewFlushCloseHandler(out FlushCloseWriter, levels []slog.Level) *FlushCloseHandler {
return &FlushCloseHandler{
Output: out,
Expand Down
3 changes: 2 additions & 1 deletion handler/write_close_syncer.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ func NewSyncCloser(out SyncCloseWriter, levels []slog.Level) *SyncCloseHandler {
// NewSyncCloseHandler create new SyncCloseHandler
//
// Usage:
//
// f, err := os.OpenFile("my.log", ...)
// h := handler.NewSyncCloseHandler(f, slog.AllLevels)
// h := handler.NewSyncCloseHandler(f, slog.AllLevels)
func NewSyncCloseHandler(out SyncCloseWriter, levels []slog.Level) *SyncCloseHandler {
return &SyncCloseHandler{
Output: out,
Expand Down
7 changes: 4 additions & 3 deletions handler/write_closer.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ func NewWriteCloser(out io.WriteCloser, levels []slog.Level) *WriteCloserHandler
// NewIOWriteCloserHandler create new WriteCloserHandler
//
// Usage:
// buf := new(bytes.Buffer)
// h := handler.NewIOWriteCloserHandler(&buf, slog.AllLevels)
//
// buf := new(bytes.Buffer)
// h := handler.NewIOWriteCloserHandler(&buf, slog.AllLevels)
//
// f, err := os.OpenFile("my.log", ...)
// h := handler.NewIOWriteCloserHandler(f, slog.AllLevels)
// h := handler.NewIOWriteCloserHandler(f, slog.AllLevels)
func NewIOWriteCloserHandler(out io.WriteCloser, levels []slog.Level) *WriteCloserHandler {
return &WriteCloserHandler{
Output: out,
Expand Down
7 changes: 4 additions & 3 deletions handler/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ func NewIOWriter(out io.Writer, levels []slog.Level) *IOWriterHandler {
// NewIOWriterHandler create new IOWriterHandler
//
// Usage:
// buf := new(bytes.Buffer)
// h := handler.NewIOWriterHandler(&buf, slog.AllLevels)
//
// buf := new(bytes.Buffer)
// h := handler.NewIOWriterHandler(&buf, slog.AllLevels)
//
// f, err := os.OpenFile("my.log", ...)
// h := handler.NewIOWriterHandler(f, slog.AllLevels)
// h := handler.NewIOWriterHandler(f, slog.AllLevels)
func NewIOWriterHandler(out io.Writer, levels []slog.Level) *IOWriterHandler {
return &IOWriterHandler{
Output: out,
Expand Down
18 changes: 10 additions & 8 deletions rotatefile/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,12 @@ const (
// RotateTime for rotate file. unit is seconds.
//
// EveryDay:
// - "error.log.20201223"
// - "error.log.20201223"
//
// EveryHour, Every30Min, EveryMinute:
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
type RotateTime int

// built in rotate time consts
Expand Down Expand Up @@ -89,11 +90,12 @@ func (rt RotateTime) level() rotateLevel {
// TimeFormat get log file suffix format
//
// EveryDay:
// - "error.log.20201223"
// - "error.log.20201223"
//
// EveryHour, Every30Min, EveryMinute:
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
// - "error.log.20201223_1500"
// - "error.log.20201223_1530"
// - "error.log.20201223_1523"
func (rt RotateTime) TimeFormat() (suffixFormat string) {
suffixFormat = "20060102_1500" // default is levelHour
switch rt.level() {
Expand Down
1 change: 0 additions & 1 deletion util.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ func EncodeToString(v any) string {
if mp, ok := v.(map[string]any); ok {
return mapToString(mp)
}

return stdutil.ToString(v)
}

Expand Down

0 comments on commit fb36553

Please sign in to comment.