Merge pull request #475 from hahattan/issue-469

Avoid logging CBOR event/reading
edgexfoundry · Apr 9, 2020 · 6d36f33 · 6d36f33
2 parents b92b1a4 + c63d396
commit 6d36f33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/internal/autoevent/executor.go b/internal/autoevent/executor.go
@@ -61,7 +61,11 @@ func (e *executor) Run(ctx context.Context, wg *sync.WaitGroup) {
 						continue
 					}
 				}
-				common.LoggingClient.Debug(fmt.Sprintf("AutoEvent - pushing event %s", evt.String()))
+				if evt.HasBinaryValue() {
+					common.LoggingClient.Debug("AutoEvent - pushing CBOR event")
+				} else {
+					common.LoggingClient.Debug(fmt.Sprintf("AutoEvent - pushing event %s", evt.String()))
+				}
 				event := &dsModels.Event{Event: evt.Event}
 				// Attach origin timestamp for events if none yet specified
 				if event.Origin == 0 {

diff --git a/internal/handler/command.go b/internal/handler/command.go
@@ -169,7 +169,11 @@ func cvsToEvent(device *contract.Device, cvs []*dsModels.CommandValue, cmd strin
 		reading := common.CommandValueToReading(cv, device.Name, dr.Properties.Value.FloatEncoding)
 		readings = append(readings, *reading)
 
-		common.LoggingClient.Debug(fmt.Sprintf("Handler - execReadCmd: device: %s DeviceResource: %v reading: %v", device.Name, cv.DeviceResourceName, reading))
+		if cv.Type == dsModels.Binary {
+			common.LoggingClient.Debug(fmt.Sprintf("Handler - execReadCmd: device: %s DeviceResource: %v reading: binary value", device.Name, cv.DeviceResourceName))
+		} else {
+			common.LoggingClient.Debug(fmt.Sprintf("Handler - execReadCmd: device: %s DeviceResource: %v reading: %v", device.Name, cv.DeviceResourceName, reading))
+		}
 	}
 
 	if !transformsOK {