diff options
| -rw-r--r-- | engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java | 7 | ||||
| -rw-r--r-- | engine-d/src/main/resources/logback-spring.xml | 2 | ||||
| -rw-r--r-- | pom.xml | 2 |
3 files changed, 3 insertions, 8 deletions
diff --git a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java index 21f5961..035b796 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/dmaap/SubscriberAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 - 2022 ZTE Corporation. + * Copyright 2017-2022 ZTE Corporation. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,10 +17,8 @@ package org.onap.holmes.engine.dmaap; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; -import org.onap.holmes.common.database.DbDaoUtil; import org.onap.holmes.dsa.dmaappolling.Subscriber; import org.onap.holmes.engine.db.AlarmInfoDaoService; -import org.onap.holmes.engine.db.jdbi.AlarmInfoDao; import org.onap.holmes.engine.manager.DroolsEngine; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -36,8 +34,6 @@ public class SubscriberAction { @Autowired private DroolsEngine droolsEngine; @Autowired - private DbDaoUtil daoUtil; - @Autowired private AlarmInfoDaoService alarmInfoDaoService; private HashMap<String, DMaaPAlarmPolling> pollingTasks = new HashMap<>(); @@ -48,7 +44,6 @@ public class SubscriberAction { if (pollingTasks.containsKey(topic)) { removeSubscriber(subscriber); } - AlarmInfoDao alarmInfoDao = daoUtil.getJdbiDaoByOnDemand(AlarmInfoDao.class); DMaaPAlarmPolling pollingTask = new DMaaPAlarmPolling(subscriber, droolsEngine, alarmInfoDaoService); Thread thread = new Thread(pollingTask); thread.start(); diff --git a/engine-d/src/main/resources/logback-spring.xml b/engine-d/src/main/resources/logback-spring.xml index 197057e..eda9c6b 100644 --- a/engine-d/src/main/resources/logback-spring.xml +++ b/engine-d/src/main/resources/logback-spring.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration debug="false"> <property name="LOG_HOME" value="/var/log/ONAP/holmes"/> - <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t] - %msg%n" /> + <property name="LOG_PATTERN" value="%d{yyyy-MM-dd HH:mm:ss SSS} %-5p [%c][%t][%X{RequestID}][%X{InvocationID}] - %m%n" /> <appender name="Console" class="ch.qos.logback.core.ConsoleAppender"> <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder"> @@ -160,7 +160,7 @@ <dependency> <groupId>org.onap.holmes.common</groupId> <artifactId>holmes-actions</artifactId> - <version>1.4.3</version> + <version>1.4.4</version> <exclusions> <exclusion> <groupId>io.swagger</groupId> |