X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fengine%2FEngineDActiveApp.java;h=a0f46ce8fa4e3f9eba90079fcd592d9a7519d203;hb=2504d624b6c65ee919db506f870ee17b31e51f90;hp=f8c266025b667eb861ecc48f2aa5f20e1455b562;hpb=12d40aa626418ba2f0880fd335c1c3f9fa953038;p=holmes%2Fengine-management.git diff --git a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java index f8c2660..a0f46ce 100644 --- a/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java +++ b/engine-d/src/main/java/org/onap/holmes/engine/EngineDActiveApp.java @@ -15,16 +15,21 @@ */ package org.onap.holmes.engine; -import static jdk.nashorn.internal.runtime.regexp.joni.Config.log; - import io.dropwizard.setup.Environment; +import java.util.EnumSet; import java.util.HashSet; import java.util.Set; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import javax.servlet.DispatcherType; import lombok.extern.slf4j.Slf4j; import org.onap.holmes.common.config.MicroServiceConfig; import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication; import org.onap.holmes.common.exception.CorrelationException; import org.onap.holmes.common.utils.MSBRegisterUtil; +import org.onap.holmes.common.utils.transactionid.TransactionIdFilter; +import org.onap.holmes.engine.dcae.DcaeConfigurationPolling; import org.onap.holmes.engine.resources.EngineResources; import org.onap.msb.sdk.discovery.entity.MicroServiceInfo; import org.onap.msb.sdk.discovery.entity.Node; @@ -45,19 +50,28 @@ public class EngineDActiveApp extends IOCApplication { } catch (CorrelationException e) { log.warn(e.getMessage(), e); } + + ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor(); + service.scheduleAtFixedRate( + new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0, + DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS); + environment.servlets().addFilter("logFilter",new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet + .allOf(DispatcherType.class),true,"/*"); } private MicroServiceInfo createMicroServiceInfo() { + String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort(); MicroServiceInfo msinfo = new MicroServiceInfo(); msinfo.setServiceName("holmes-engine-mgmt"); msinfo.setVersion("v1"); - msinfo.setUrl("/onapapi/holmes-engine-mgmt/v1"); + msinfo.setUrl("/api/holmes-engine-mgmt/v1"); msinfo.setProtocol("REST"); msinfo.setVisualRange("0|1"); + msinfo.setEnable_ssl(true); Set nodes = new HashSet<>(); Node node = new Node(); - node.setIp(MicroServiceConfig.getServiceIp()); - node.setPort("9102"); + node.setIp(serviceAddrInfo[0]); + node.setPort(serviceAddrInfo[1]); nodes.add(node); msinfo.setNodes(nodes); return msinfo;