diff options
| author |   Venkatesh Kumar, Vijay (vv770d) <vv770d@att.com> | 2017-05-03 13:52:30 -0400 |
|---|---|---|
| committer | Venkatesh Kumar, Vijay (vv770d) <vv770d@att.com> | 2017-05-03 13:54:06 -0400 |
| commit | 5e759d1a8c83f3ee9d7bcf91249e82ef36dec35a (patch) | |
| tree | e9040bedceae441b5a73e647443cb8025a9c9791 /src/main/java/org | |
| parent | d9b4368b020b455e6fe1ffb12cb06236edff0e4b (diff) | |
[DCAE-14]VES op format & dynamic config
Change-Id: I0ed0cada8c3d6276f8e4adda8ad4451b2222bc76
Signed-off-by: Venkatesh Kumar, Vijay (vv770d) <vv770d@att.com>
Diffstat (limited to 'src/main/java/org')
| -rw-r--r-- | src/main/java/org/openecomp/dcae/commonFunction/EventProcessor.java | 7 | ||||
| -rw-r--r-- | src/main/java/org/openecomp/dcae/commonFunction/VESLogger.java | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/main/java/org/openecomp/dcae/commonFunction/EventProcessor.java b/src/main/java/org/openecomp/dcae/commonFunction/EventProcessor.java index a5e90b9..5f27217 100644 --- a/src/main/java/org/openecomp/dcae/commonFunction/EventProcessor.java +++ b/src/main/java/org/openecomp/dcae/commonFunction/EventProcessor.java @@ -69,8 +69,6 @@ public class EventProcessor implements Runnable { //EventPublisher Ep=new EventPublisher(); while (event != null) { // As long as the producer is running we remove elements from the queue. - - //UUID uuid = UUID.fromString(event.get("VESuniqueId").toString()); String uuid = event.get("VESuniqueId").toString(); LoggingContext localLC = VESLogger.getLoggingContextForThread(uuid.toString()); localLC .put ( EcompFields.kBeginTimestampMs, SaClock.now () ); @@ -110,10 +108,9 @@ public class EventProcessor implements Runnable { final SimpleDateFormat sdf = new SimpleDateFormat("EEE, MM dd yyyy hh:mm:ss z"); sdf.setTimeZone(TimeZone.getTimeZone("GMT")); - JSONArray additionalParametersarray = new JSONArray().put(new JSONObject().put("collectorTimeStamp", sdf.format(currentTime))); - JSONObject additionalParameter = new JSONObject().put("additionalParameters",additionalParametersarray ); + JSONObject collectorTimeStamp = new JSONObject().put("collectorTimeStamp",sdf.format(currentTime) ); JSONObject commonEventHeaderkey = event.getJSONObject("event").getJSONObject("commonEventHeader"); - commonEventHeaderkey.put("internalHeaderFields", additionalParameter); + commonEventHeaderkey.put("internalHeaderFields", collectorTimeStamp); event.getJSONObject("event").put("commonEventHeader",commonEventHeaderkey); log.debug("Modified event:" + event); diff --git a/src/main/java/org/openecomp/dcae/commonFunction/VESLogger.java b/src/main/java/org/openecomp/dcae/commonFunction/VESLogger.java index 7a70013..9b16d01 100644 --- a/src/main/java/org/openecomp/dcae/commonFunction/VESLogger.java +++ b/src/main/java/org/openecomp/dcae/commonFunction/VESLogger.java @@ -116,7 +116,7 @@ public class VESLogger { build(); // Establish the request-specific UUID, as long as we are here... threadLC.put("requestId", aUuid); - threadLC.put ( "statusCode", "COMPLETED" ); + threadLC.put ( "statusCode", "COMPLETE" ); threadLC.put ( EcompFields.kEndTimestamp, SaClock.now () ); return threadLC; } |