summaryrefslogtreecommitdiffstats
path: root/prh-app-server
diff options
context:
space:
mode:
authorwasala <przemyslaw.wasala@nokia.com>2018-03-28 14:20:58 +0200
committerwasala <przemyslaw.wasala@nokia.com>2018-03-28 14:20:58 +0200
commitd8e4e88b6080dfd701ea7aa64d033c38899e77c6 (patch)
tree87e23a50375086b4c3737084f9e9d6f6d17229a2 /prh-app-server
parent961af3e21239edd4714e7e586ed5db902bd85d53 (diff)
Added logs
Improve Dockerfile and build fat jar Change-Id: I8b4dd1a56350af310c70236d6843ae1c357ad95e Issue-ID: DCAEGEN2-407 Signed-off-by: wasala <przemyslaw.wasala@nokia.com>
Diffstat (limited to 'prh-app-server')
-rw-r--r--prh-app-server/pom.xml25
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java19
-rw-r--r--prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java2
-rw-r--r--prh-app-server/src/main/resources/logback.xml23
4 files changed, 44 insertions, 25 deletions
diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml
index a03e27f3..5a62e40e 100644
--- a/prh-app-server/pom.xml
+++ b/prh-app-server/pom.xml
@@ -22,6 +22,17 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>repackage</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <finalName>prh-app-server</finalName>
+ <mainClass>org.onap.dcaegen2.services.prh.MainApp</mainClass>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -39,18 +50,16 @@
<!-- LOGGING DEPENDENCIES-->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
</dependency>
-
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jul-to-slf4j</artifactId>
</dependency>
-
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
</dependency>
<!--TESTS DEPENDENCIES -->
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
index 91ed6024..cb2d1331 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/DmaapConsumerTask.java
@@ -36,24 +36,11 @@ public class DmaapConsumerTask implements DmaapTask {
@Override
public void execute() {
- logger.info("Start task DmaapConsumerTask::execute() :: Execution Time - {}", dateTimeFormatter.format(
+ logger.debug("Start task DmaapConsumerTask::execute() :: Execution Time - {}", dateTimeFormatter.format(
LocalDateTime.now()));
//TODO: ADD implementation for executing request to consume topic from dmaap
- //DmappConsumerRunner dmappConsumerRunner = consumer.play()
- //if(dmappConsumerRunner != null){
- //AAIProcess aaiProcess = new AAiPRocess(dmappConsumerRunner)
- /*
- try{
- aaiProcess.Execute()
- }
- catch(Exception e(){
- Log
- return
- }
- DmaapConsumerPost post;
- */
- //}
- logger.info("End task DmaapConsumerTask::execute() :: Execution Time - {}",
+
+ logger.debug("End task DmaapConsumerTask::execute() :: Execution Time - {}",
dateTimeFormatter.format(LocalDateTime.now()));
}
} \ No newline at end of file
diff --git a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
index 5ed3c8c0..a3a48b79 100644
--- a/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
+++ b/prh-app-server/src/main/java/org/onap/dcaegen2/services/prh/tasks/ScheduledTask.java
@@ -48,7 +48,7 @@ public class ScheduledTask {
@Scheduled(fixedDelay = SCHEDULING_DELAY)
public void scheduledTaskAskingDMaaPOfConsumeEvent() {
- logger.info("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
+ logger.debug("Task scheduledTaskAskingDMaaPOfConsumeEvent() :: Execution Time - {}", dateTimeFormatter.format(
LocalDateTime.now()));
try {
dmaapConsumerTask.execute();
diff --git a/prh-app-server/src/main/resources/logback.xml b/prh-app-server/src/main/resources/logback.xml
new file mode 100644
index 00000000..5f5175e0
--- /dev/null
+++ b/prh-app-server/src/main/resources/logback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+ <property name="LOG_PATH" value="logs"/>
+ <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+ <file>${LOG_PATH}/logFile.log</file>
+ <append>true</append>
+ <encoder>
+ <pattern>%d{yyyy-MM-dd HH:mm:ss} | %-5p | [%thread] %logger{5}:%L - %msg%n</pattern>
+ </encoder>
+ </appender>
+
+ <logger name="org.onap.dcaegen2.services.prh" level="TRACE"/>
+ <root level="DEBUG">
+ <appender-ref ref="STDOUT"/>
+ <appender-ref ref="FILE"/>
+ </root>
+</configuration> \ No newline at end of file