Skip to content

Commit

Permalink
refactor: Avoid to use huge memory, and some receiver name
Browse files Browse the repository at this point in the history
  • Loading branch information
chuck committed Jul 12, 2023
1 parent c1eb520 commit 41a3908
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions internal/logger/adapter/zerolog_log_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,19 +59,19 @@ func NewZerologLogRepository(logDir string) *ZerologLogRepository {
}

// WriteAccessLog writes the access log to the appropriate logger.
func (r *ZerologLogRepository) WriteAccessLog(log entity.AccessLog) {
func (r *ZerologLogRepository) WriteAccessLog(log *entity.AccessLog) {
b, _ := json.Marshal(log)
r.accessLogger.Info().RawJSON("log", b).Msg("")
}

// WritePostLog writes the post log to the appropriate logger.
func (r *ZerologLogRepository) WritePostLog(log entity.PostLog) {
func (r *ZerologLogRepository) WritePostLog(log *entity.PostLog) {
b, _ := json.Marshal(log)
r.postLogger.Info().RawJSON("log", b).Msg("")
}

// WriteErrorLog writes the error log to the appropriate logger.
func (r *ZerologLogRepository) WriteErrorLog(log entity.ErrorLog) {
func (r *ZerologLogRepository) WriteErrorLog(log *entity.ErrorLog) {
b, _ := json.Marshal(log)
r.errorLogger.Info().RawJSON("log", b).Msg("")
}
Expand Down
2 changes: 1 addition & 1 deletion internal/logger/entity/access_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type AccessLog struct {
}

// String formats the AccessLog as a string.
func (l AccessLog) String() string {
func (l *AccessLog) String() string {
return fmt.Sprintf(
`"%s" %s "%s %s %s" "%s" "%s" %d %d %d %s "%s" "%s" "%s"`,
l.At.Local().Format(time.RFC3339),
Expand Down
2 changes: 1 addition & 1 deletion internal/logger/entity/post_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ type PostLog struct {
}

// String returns a formatted string representation of the PostLog.
func (l PostLog) String() string {
func (l *PostLog) String() string {
return fmt.Sprintf(
`%s %s "%s %s" %d %d %s "%s" "%s" "%s" %s`,
l.At.Local().Format(time.RFC3339),
Expand Down
6 changes: 3 additions & 3 deletions internal/logger/repository/log_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

// LogRepository defines the interface for a log repository.
type LogRepository interface {
WriteAccessLog(log entity.AccessLog) // Write access log entry
WritePostLog(log entity.PostLog) // Write post log entry
WriteErrorLog(log entity.ErrorLog) // Write error log entry
WriteAccessLog(log *entity.AccessLog) // Write access log entry
WritePostLog(log *entity.PostLog) // Write post log entry
WriteErrorLog(log *entity.ErrorLog) // Write error log entry
WriteHTTPRequestLog(log *entity.HTTPRequestLog) // Write http-request log entry
}
10 changes: 5 additions & 5 deletions internal/logger/service/log_http_transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type LogHTTPTransport struct {
}

// RoundTrip executes a single HTTP transaction and logs the request and response information.
func (tripper *LogHTTPTransport) RoundTrip(req *http.Request) (res *http.Response, err error) {
func (t *LogHTTPTransport) RoundTrip(req *http.Request) (res *http.Response, err error) {
var reqBody, resBody []byte

log := entity.HTTPRequestLog{
Expand All @@ -37,25 +37,25 @@ func (tripper *LogHTTPTransport) RoundTrip(req *http.Request) (res *http.Respons
}

if reqBody, req.Body, err = drainBody(req.Body); err == nil {
log.ReqBody = tripper.decodeBody(reqBody)
log.ReqBody = t.decodeBody(reqBody)
}

res, err = tripper.core.RoundTrip(req)
res, err = t.core.RoundTrip(req)
if err != nil {
log.Error = err
return nil, err
}

if resBody, res.Body, err = drainBody(res.Body); err == nil {
log.ResBody = tripper.decodeBody(resBody)
log.ResBody = t.decodeBody(resBody)
}

log.StatusCode = res.StatusCode
log.Latency = time.Since(log.At)
log.ResHeader = res.Header

ev := event.NewHTTPRequestDoneEvent(&log)
tripper.eventBus.Post(ev)
t.eventBus.Post(ev)

return res, nil
}
Expand Down
2 changes: 1 addition & 1 deletion internal/logger/usecase/log_access_usecase.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ func (uc *LogAccessUseCase) When(eventName string, message []byte) {

// Execute performs the logging of access events based on the provided input.
func (uc *LogAccessUseCase) Execute(input *LogAccessUseCaseInput) (LogAccessUseCaseOutput, error) {
log := entity.AccessLog{
log := &entity.AccessLog{
At: input.At,
Method: input.Method,
Origin: input.Origin,
Expand Down
2 changes: 1 addition & 1 deletion internal/logger/usecase/log_error_usecase.go
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ func (uc *LogErrorUseCase) When(eventName string, message []byte) {

// Execute performs the logging of error events based on the provided input.
func (uc *LogErrorUseCase) Execute(input *LogErrorUseCaseInput) (LogErrorUseCaseOutput, error) {
log := entity.ErrorLog{
log := &entity.ErrorLog{
At: input.At,
IP: input.IP,
Method: input.Method,
Expand Down
2 changes: 1 addition & 1 deletion internal/logger/usecase/log_post_usecase.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (uc *LogPostUseCase) When(eventName string, message []byte) {

// Execute performs the logging of post request events based on the provided input.
func (uc *LogPostUseCase) Execute(input *LogPostUseCaseInput) (LogPostUseCaseOutput, error) {
log := entity.PostLog{
log := &entity.PostLog{
At: input.At,
IP: input.IP,
Method: input.Method,
Expand Down

0 comments on commit 41a3908

Please sign in to comment.