X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2FRuleActiveApp.java;h=cedcde097f494b40341a17d77685ad55f7e34e41;hb=ecf54e8ad1182aa14b5f942160e1834725a432f9;hp=058aea713c870dd0b09046a4b35a2aa4dfdd6adf;hpb=cc31e5503fbc9c17ada9e3b324457c3a2d67ec54;p=holmes%2Frule-management.git
diff --git a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
index 058aea7..cedcde0 100644
--- a/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@ -1,5 +1,5 @@
/**
- * Copyright 2017-2018 ZTE Corporation.
+ * Copyright 2017-2020 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,85 +17,36 @@
package org.onap.holmes.rulemgt;
import io.dropwizard.setup.Environment;
-import lombok.extern.slf4j.Slf4j;
-import org.onap.holmes.common.config.MicroServiceConfig;
+import org.onap.holmes.common.ConfigFileScanner;
import org.onap.holmes.common.dropwizard.ioc.bundle.IOCApplication;
-import org.onap.holmes.common.exception.CorrelationException;
-import org.onap.holmes.common.utils.HttpsUtils;
-import org.onap.holmes.common.utils.MSBRegisterUtil;
import org.onap.holmes.common.utils.transactionid.TransactionIdFilter;
-import org.onap.holmes.rulemgt.dcae.DcaeConfigurationPolling;
-import org.onap.holmes.rulemgt.msb.MsbQuery;
-import org.onap.holmes.rulemgt.resources.RuleMgtResources;
-import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
-import org.onap.msb.sdk.discovery.entity.Node;
+import org.onap.holmes.rulemgt.dcae.ConfigFileScanningTask;
import javax.servlet.DispatcherType;
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;
-@Slf4j
public class RuleActiveApp extends IOCApplication {
public static void main(String[] args) throws Exception {
new RuleActiveApp().run(args);
}
- @Override
- public String getName() {
- return "Holmes Rule Management ActiveApp APP ";
- }
-
@Override
public void run(RuleAppConfig configuration, Environment environment) throws Exception {
super.run(configuration, environment);
- environment.jersey().register(new RuleMgtResources());
- try {
- new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
- } catch (CorrelationException e) {
- log.warn(e.getMessage(), e);
- }
-
- if (!"1".equals(System.getenv("TESTING"))) {
- ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
- service.scheduleAtFixedRate(
- new DcaeConfigurationPolling(MicroServiceConfig.getEnv(MicroServiceConfig.HOSTNAME)), 0,
- DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
- }
+ ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+ service.scheduleAtFixedRate(
+ new ConfigFileScanningTask(new ConfigFileScanner()), 60L,
+ ConfigFileScanningTask.POLLING_PERIOD, TimeUnit.SECONDS);
environment.servlets().addFilter("customFilter", new TransactionIdFilter()).addMappingForUrlPatterns(EnumSet
.allOf(DispatcherType.class), true, "/*");
- new MsbQuery().startTimer();
- }
-
- private MicroServiceInfo createMicroServiceInfo() {
- String msbAddrTemplate = (HttpsUtils.isHttpsEnabled() ? "https" : "http")
- + "://%s:%s/api/holmes-rule-mgmt/v1/healthcheck";
- String[] serviceAddrInfo = MicroServiceConfig.getMicroServiceIpAndPort();
- MicroServiceInfo msinfo = new MicroServiceInfo();
- msinfo.setServiceName("holmes-rule-mgmt");
- msinfo.setVersion("v1");
- msinfo.setUrl("/api/holmes-rule-mgmt/v1");
- msinfo.setProtocol("REST");
- msinfo.setVisualRange("0|1");
- msinfo.setEnable_ssl(HttpsUtils.isHttpsEnabled());
- Set nodes = new HashSet<>();
- Node node = new Node();
- node.setIp(serviceAddrInfo[0]);
- node.setPort("9101");
- node.setCheckType("HTTP");
- node.setCheckUrl(String.format(msbAddrTemplate, serviceAddrInfo[0], "9101"));
- node.setCheckTimeOut("60s");
- node.setCheckInterval("60s");
- nodes.add(node);
- msinfo.setNodes(nodes);
- return msinfo;
+ Initializer.setReadyForMsbReg(true);
}
}