Skip to content

Commit 512df4a

Browse files
authored
format event and event context to single line in logger. (#437)
* format event and event context to single line in logger. Signed-off-by: Morven Cao <lcao@redhat.com> * address comments. Signed-off-by: Morven Cao <lcao@redhat.com> --------- Signed-off-by: Morven Cao <lcao@redhat.com>
1 parent 7f29bb6 commit 512df4a

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

cmd/maestro/server/grpc_server.go

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,15 @@ func (svr *GRPCServer) Publish(ctx context.Context, pubReq *pbv1.PublishRequest)
190190
return nil, fmt.Errorf("failed to parse cloud event type %s, %v", evt.Type(), err)
191191
}
192192

193-
logger.Info("receive the event from client", "context", evt.Context)
194193
if logger.V(4).Enabled() {
195194
evtJson, _ := evt.MarshalJSON()
196195
logger.V(4).Info("receive the event from client", "event", string(evtJson))
196+
} else {
197+
logger.Info("receive the event from client",
198+
"eventID", evt.ID(),
199+
"eventType", evt.Type(),
200+
"eventSource", evt.Source(),
201+
"extensions", evt.Extensions())
197202
}
198203

199204
// handler resync request
@@ -310,8 +315,16 @@ func (svr *GRPCServer) Subscribe(subReq *pbv1.SubscriptionRequest, subServer pbv
310315
return fmt.Errorf("failed to encode cloudevent: %v", err)
311316
}
312317

313-
logger.Info("send the event to status subscribers", "context", evt.Context)
314-
logger.V(4).Info("send the event to status subscribers", "event", evt)
318+
if logger.V(4).Enabled() {
319+
evtJson, _ := evt.MarshalJSON()
320+
logger.V(4).Info("send the event to status subscribers", "event", string(evtJson))
321+
} else {
322+
logger.Info("send the event to status subscribers",
323+
"eventID", evt.ID(),
324+
"eventType", evt.Type(),
325+
"eventSource", evt.Source(),
326+
"extensions", evt.Extensions())
327+
}
315328

316329
// WARNING: don't use "pbEvt, err := pb.ToProto(evt)" to convert cloudevent to protobuf
317330
pbEvt := &pbv1.CloudEvent{}

pkg/services/resource.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,8 +199,16 @@ func (s *sqlResourceService) UpdateStatus(ctx context.Context, resource *api.Res
199199
return nil, false, errors.GeneralError("Unable to convert resource status to cloudevent: %s", err)
200200
}
201201

202-
logger.Info("Updating resource status")
203-
logger.V(4).Info("Updating resource status", "event", resourceStatusEvent)
202+
if logger.V(4).Enabled() {
203+
evtJson, _ := resourceStatusEvent.MarshalJSON()
204+
logger.V(4).Info("Updating resource status", "event", string(evtJson))
205+
} else {
206+
logger.Info("Updating resource status",
207+
"eventID", resourceStatusEvent.ID(),
208+
"eventType", resourceStatusEvent.Type(),
209+
"eventSource", resourceStatusEvent.Source(),
210+
"extensions", resourceStatusEvent.Extensions())
211+
}
204212

205213
sequenceID, err := cloudeventstypes.ToString(resourceStatusEvent.Context.GetExtensions()[cetypes.ExtensionStatusUpdateSequenceID])
206214
if err != nil {

0 commit comments

Comments
 (0)