From 0ac4608567f18a4007c76703f9ab6e34aa97ee97 Mon Sep 17 00:00:00 2001
From: Semyon Krestyaninov <ensiouel@gmail.com>
Date: Wed, 14 Feb 2024 13:48:24 +0300
Subject: [PATCH] refactor info_log.tmpl
---
assets/templates/middleware/info_log.tmpl | 31 +++++++++++------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/assets/templates/middleware/info_log.tmpl b/assets/templates/middleware/info_log.tmpl
index 195caef8..4d431885 100644
--- a/assets/templates/middleware/info_log.tmpl
+++ b/assets/templates/middleware/info_log.tmpl
@@ -3,7 +3,6 @@ import (
"time"
"context"
- "git.perx.ru/perxis/perxis-go/pkg/items"
logzap "git.perx.ru/perxis/perxis-go/pkg/log/zap"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
@@ -38,7 +37,7 @@ func {{ $funcName }} (logger *zap.Logger) Middleware {
{{ $inputObject := "" }}
{{ $outputObject := "" }}
- {{ if gt (len $method.Results) 1 }}
+ {{ if or (gt (len $method.Results) 1) (not $method.ReturnsError) }}
{{ $outputObject = (first $method.Results).Name }}
{{ end }}
@@ -49,28 +48,28 @@ func {{ $funcName }} (logger *zap.Logger) Middleware {
{{ end }}
fields := []zapcore.Field{
- logzap.Event({{ $packageName }}.Event{{ $method.Name }}{{ $objectName }}),
- logzap.CallerFromContext(ctx),
- {{/* {{ if eq $outputObject "" }} logzap.Object({{ $inputObject }}), {{- end }}*/}}
+ logzap.Event({{ $packageName }}.Event{{ $method.Name }}{{ $objectName }}),
+ logzap.CallerFromContext(ctx),
+ {{ if not $outputObject }} logzap.Object({{ $inputObject }}), {{ end }}
+ {{- if and $outputObject (not $method.ReturnsError) }} logzap.Object({{ $outputObject }}), {{- end }}
}
{{ if $method.ReturnsError }}
if err != nil {
- {{- if not (eq $inputObject "") }}
- fields = append(fields, logzap.Object({{ $inputObject }}))
- {{- end }}
- m.logger.Error(fmt.Sprintf("Failed to {{ (lower $method.Name) }}. Error: %s", err), fields...)
+ {{- if and $inputObject $outputObject }}
+ fields = append(fields, logzap.Object({{ $inputObject }}))
+ {{- end }}
+ m.logger.Error(fmt.Sprintf("Failed to {{ (lower $method.Name) }}. Error: %s", err), fields...)
} else {
- {{- if not (eq $outputObject "") }}
- fields = append(fields, logzap.Object({{ $inputObject }}))
- {{- else if not (eq $inputObject "") }}
- fields = append(fields, logzap.Object({{ $inputObject }}))
- {{- end }}
- m.logger.Info("Successfully {{ (lower (trimSuffix "e" $method.Name)) }}ed", fields...)
+ {{- if $outputObject }}
+ fields = append(fields, logzap.Object({{ $outputObject }}))
+ {{- end }}
+ m.logger.Info("Successfully {{ (lower (trimSuffix "e" $method.Name)) }}ed", fields...)
}
+ {{ else }}
+ m.logger.Info("Successfully {{ (lower (trimSuffix "e" $method.Name)) }}ed", fields...)
{{ end }}
- m.logger.Info("{{ $method.Name }}", fields...)
return {{ $method.ResultsNames }}
{{- else }}
return m.next.{{ $method.Call }}
--
GitLab