Fix log reporting

Fix loop log reported in UI, in case of failure it's not working
correclty

Issue-ID: CLAMP-360
Change-Id: I4533c650134b254619523d8c9cfe2791e9b6584b
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/extra/sql/bulkload/create-tables.sql b/extra/sql/bulkload/create-tables.sql
index 3c261eb..da39ca5 100644 (file)
--- a/extra/sql/bulkload/create-tables.sql
+++ b/extra/sql/bulkload/create-tables.sql
@@ -9,7 +9,7 @@
        id bigint not null,
         log_instant datetime(6) not null,
         log_type varchar(255) not null,
-        message varchar(255) not null,
+        message MEDIUMTEXT not null,
         loop_id varchar(255) not null,
         primary key (id)
     ) engine=InnoDB;

diff --git a/src/main/java/org/onap/clamp/loop/log/LoopLog.java b/src/main/java/org/onap/clamp/loop/log/LoopLog.java
index 3edb2ee..cea4957 100644 (file)
--- a/src/main/java/org/onap/clamp/loop/log/LoopLog.java
+++ b/src/main/java/org/onap/clamp/loop/log/LoopLog.java
@@ -69,7 +69,7 @@ public class LoopLog implements Serializable {
     private LogType logType;
 
     @Expose
-    @Column(name = "message", nullable = false)
+    @Column(name = "message", columnDefinition = "MEDIUMTEXT", nullable = false)
     private String message;
 
     @ManyToOne(fetch = FetchType.LAZY)

diff --git a/src/main/resources/clds/camel/rest/clamp-api-v2.xml b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
index 5c5f122..4c1cd81 100644 (file)
--- a/src/main/resources/clds/camel/rest/clamp-api-v2.xml
+++ b/src/main/resources/clds/camel/rest/clamp-api-v2.xml
@@ -286,7 +286,7 @@
                                                        loggingLevel="ERROR"
                                                        message="STOP request failed for loop: $${header.loopName}" />
                                                <to
-                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed','ERROR',${exchangeProperty[loopObject]})" />
+                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('STOP request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
                                        </doCatch>
                                </doTry>
                        </route>
@@ -331,7 +331,7 @@
                                                        loggingLevel="ERROR"
                                                        message="START request failed for loop: ${header.loopName}" />
                                                <to
-                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request failed','INFO',${exchangeProperty[loopObject]})" />
+                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('START request failed, Error reported: ${exception}','INFO',${exchangeProperty[loopObject]})" />
                                        </doCatch>
                                </doTry>
                        </route>
@@ -439,7 +439,7 @@
                                                        loggingLevel="ERROR"
                                                        message="SUBMIT request failed for loop: ${header.loopName}" />
                                                <to
-                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed','ERROR',${exchangeProperty[loopObject]})" />
+                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('SUBMIT request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
                                        </doCatch>
                                </doTry>
                        </route>
@@ -521,7 +521,7 @@
                                                        loggingLevel="ERROR"
                                                        message="DELETE request failed for loop: ${header.loopName}" />
                                                <to
-                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed','ERROR',${exchangeProperty[loopObject]})" />
+                                                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('DELETE request failed, Error reported: ${exception}','ERROR',${exchangeProperty[loopObject]})" />
                                        </doCatch>
                                </doTry>
                        </route>

diff --git a/src/main/resources/clds/camel/routes/flexible-flow.xml b/src/main/resources/clds/camel/routes/flexible-flow.xml
index 75341de..1ae6e3d 100644 (file)
--- a/src/main/resources/clds/camel/routes/flexible-flow.xml
+++ b/src/main/resources/clds/camel/routes/flexible-flow.xml
@@ -478,8 +478,7 @@
                                        <constant>false</constant>
                                </handled>
                                <setProperty propertyName="logMessage">
-                                       <simple>${exchangeProperty[policyName]} PDP Group removal status
-                                       </simple>
+                                       <simple>PDP Group removal, Error reported: ${exception}</simple>
                                </setProperty>
                                <to uri="direct:dump-loop-log-http-response" />
                        </doCatch>
@@ -500,7 +499,8 @@
 
        <route id="dump-loop-log-http-response">
                <from uri="direct:dump-loop-log-http-response" />
+               <log loggingLevel="INFO" message="${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}" />
                <to
-                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog(${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText},'INFO',${exchangeProperty[loopObject]})" />
+                       uri="bean:org.onap.clamp.loop.log.LoopLogService?method=addLog('${exchangeProperty[logMessage]} - ${header.CamelHttpResponseCode} : ${header.CamelHttpResponseText}','INFO',${exchangeProperty[loopObject]})" />
        </route>
 </routes>
\ No newline at end of file