Merge pull request #56 from spinnaker/fix-event-flattening

events were being incorrectly flattened for all events
spinnaker · Dec 21, 2015 · 56e9f73 · 56e9f73
2 parents 6f60674 + b6b12af
commit 56e9f73
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/echo-rest/src/main/groovy/com/netflix/spinnaker/echo/events/RestEventListener.groovy b/echo-rest/src/main/groovy/com/netflix/spinnaker/echo/events/RestEventListener.groovy
@@ -47,26 +47,23 @@ class RestEventListener implements EchoEventListener {
 
   @Override
   void processEvent(Event event) {
-    Map eventAsMap = mapper.convertValue(event, Map)
     restUrls.services.each { service ->
       try {
+        Map eventAsMap = mapper.convertValue(event, Map)
         Map sentEvent = eventAsMap
+        if (service.config.flatten) {
+          eventAsMap.content = mapper.writeValueAsString(eventAsMap.content)
+          eventAsMap.details = mapper.writeValueAsString(eventAsMap.details)
+        }
         if (service.config.wrap) {
           sentEvent = [
             "eventName": "${service.config.eventName ?: eventName}" as String,
           ]
-
-          if (service.config.flatten) {
-            eventAsMap.content = mapper.writeValueAsString(eventAsMap.content)
-            eventAsMap.details = mapper.writeValueAsString(eventAsMap.details)
-          }
-
           sentEvent["${service.config.fieldName ?: fieldName}" as String] = eventAsMap
-
         }
         service.client.recordEvent(sentEvent)
       } catch (e) {
-        log.error("Could not send event ${eventAsMap} to ${service.config.url}", e)
+        log.error("Could not send event ${event} to ${service.config.url}", e)
       }
     }
   }