Fix bugs and formatting issues

Added minor functionality changes
License formatting fixed

Change-Id: Ieed4aab7562256eaf15627de0cee53cfe1cc8956
Issue-ID: DCAEGEN2-1111
Signed-off-by: krishnaa96 <krishna.moorthy6@wipro.com>

1 files changed, 35 insertions, 40 deletions

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 28586fd..ae59b6e 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -1,43 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- ============LICENSE_START======================================================= 
-	son-handler ================================================================================ 
-	Copyright (C) 2019 Wipro Limited. ============================================================================== 
-	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
-	use this file except in compliance with the License. You may obtain a copy 
-	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
-	by applicable law or agreed to in writing, software distributed under the 
-	License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS 
-	OF ANY KIND, either express or implied. See the License for the specific 
-	language governing permissions and limitations under the License. ============LICENSE_END========================================================= -->
-<configuration>
-	<appender name="FILE-THREAD" class="ch.qos.logback.classic.sift.SiftingAppender">
-		<discriminator>
-			<key>logFileName</key>
-			<defaultValue>log</defaultValue>
-		</discriminator>
+<!-- 
+/*******************************************************************************
+ *  ============LICENSE_START=======================================================
+ *  son-handler
+ *  ================================================================================
+ *   Copyright (C) 2019 Wipro Limited.
+ *   ==============================================================================
+ *     Licensed under the Apache License, Version 2.0 (the "License");
+ *     you may not use this file except in compliance with the License.
+ *     You may obtain a copy of the License at
+ *  
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *     Unless required by applicable law or agreed to in writing, software
+ *     distributed under the License is distributed on an "AS IS" BASIS,
+ *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *     See the License for the specific language governing permissions and
+ *     limitations under the License.
+ *     ============LICENSE_END=========================================================
+ *  
+ *******************************************************************************/
+  -->
+	<configuration>
+
+    <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>
+                %d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </layout>
+    </appender>
+
+    <root level="info">
+        <appender-ref ref="CONSOLE"/>
+    </root>
 
-		<sift>
-			<appender name="file-${logFileName}"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>/var/log/onap/son-handler/${logFileName}.log</file>
-				<rollingPolicy
-					class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-					<fileNamePattern>${logFileName}.%i.log.zip</fileNamePattern>
-					<minIndex>1</minIndex>
-					<maxIndex>5</maxIndex>
-				</rollingPolicy>
-				<triggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-					<maxFileSize>5MB</maxFileSize>
-				</triggeringPolicy>
-				<encoder>
-					<pattern>%d{dd-MM-yyyy HH:mm:ss.SSS} %magenta([%thread])
-						%highlight(%-5level) %logger{36}.%M - %msg%n</pattern>
-				</encoder>
-			</appender>
-		</sift>
-	</appender>
-	<root level="info">
-		<appender-ref ref="FILE-THREAD" />
-	</root>
 </configuration>