Skip to content

Commit

Permalink
Revert "refactor "log" package and modify some attribute keys"
Browse files Browse the repository at this point in the history
This reverts commit cd23525.
  • Loading branch information
siburu committed Aug 22, 2024
1 parent 0c02fc7 commit 98dba71
Showing 1 changed file with 23 additions and 25 deletions.
48 changes: 23 additions & 25 deletions log/slog.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,44 +105,38 @@ func GetLogger() *RelayLogger {
return relayLogger
}

func (rl *RelayLogger) With(args ...any) *RelayLogger {
return &RelayLogger{
Logger: rl.Logger.With(args...),
}
}

func (rl *RelayLogger) WithChain(
chainID string,
) *RelayLogger {
return rl.With(
slog.Group("chain",
return &RelayLogger{
rl.Logger.With(
"chain_id", chainID,
),
)
}
}

func (rl *RelayLogger) WithChainPair(
srcChainID string,
dstChainID string,
) *RelayLogger {
return rl.With(
slog.Group("chain_pair",
return &RelayLogger{
rl.Logger.With(
slog.Group("src",
"chain_id", srcChainID,
),
slog.Group("dst",
"chain_id", dstChainID,
),
),
)
}
}

func (rl *RelayLogger) WithClientPair(
srcChainID, srcClientID string,
dstChainID, dstClientID string,
) *RelayLogger {
return rl.With(
slog.Group("client_pair",
return &RelayLogger{
rl.Logger.With(
slog.Group("src",
"chain_id", srcChainID,
"client_id", srcClientID,
Expand All @@ -152,27 +146,27 @@ func (rl *RelayLogger) WithClientPair(
"client_id", dstClientID,
),
),
)
}
}

func (rl *RelayLogger) WithChannel(
chainID, portID, channelID string,
) *RelayLogger {
return rl.With(
slog.Group("channel",
return &RelayLogger{
rl.Logger.With(
"chain_id", chainID,
"port_id", portID,
"channel_id", channelID,
),
)
}
}

func (rl *RelayLogger) WithChannelPair(
srcChainID, srcPortID, srcChannelID string,
dstChainID, dstPortID, dstChannelID string,
) *RelayLogger {
return rl.With(
slog.Group("channel_pair",
return &RelayLogger{
rl.Logger.With(
slog.Group("src",
"chain_id", srcChainID,
"port_id", srcPortID,
Expand All @@ -184,15 +178,15 @@ func (rl *RelayLogger) WithChannelPair(
"channel_id", dstChannelID,
),
),
)
}
}

func (rl *RelayLogger) WithConnectionPair(
srcChainID, srcClientID, srcConnectionID string,
dstChainID, dstClientID, dstConnectionID string,
) *RelayLogger {
return rl.With(
slog.Group("connection_pair",
return &RelayLogger{
rl.Logger.With(
slog.Group("src",
"chain_id", srcChainID,
"client_id", srcClientID,
Expand All @@ -204,13 +198,17 @@ func (rl *RelayLogger) WithConnectionPair(
"connection_id", dstConnectionID,
),
),
)
}
}

func (rl *RelayLogger) WithModule(
moduleName string,
) *RelayLogger {
return rl.With("module", moduleName)
return &RelayLogger{
rl.Logger.With(
"module", moduleName,
),
}
}

func (rl *RelayLogger) TimeTrack(start time.Time, name string, otherArgs ...any) {
Expand Down

0 comments on commit 98dba71

Please sign in to comment.