X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=rulemgt%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Frulemgt%2FRuleActiveApp.java;h=cedcde097f494b40341a17d77685ad55f7e34e41;hb=ecf54e8ad1182aa14b5f942160e1834725a432f9;hp=ba61a28496d116516f001b18d0197fb90574de26;hpb=7dbc431fa39b0c0094033780c78cb6f871221f85;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 ba61a28..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.
  * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,32 +17,19 @@
 package org.onap.holmes.rulemgt;
 
 import io.dropwizard.setup.Environment;
-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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+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;
 
 public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
 
-    private Logger log = LoggerFactory.getLogger(RuleActiveApp.class);
-
     public static void main(String[] args) throws Exception {
         new RuleActiveApp().run(args);
     }
@@ -51,51 +38,15 @@ public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
     public void run(RuleAppConfig configuration, Environment environment) throws Exception {
         super.run(configuration, environment);
 
-        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.setPath("/api/holmes-rule-mgmt/v1");
-        msinfo.setProtocol("REST");
-        msinfo.setVisualRange("0|1");
-        msinfo.setLb_policy("round-robin");
-        msinfo.setEnable_ssl(HttpsUtils.isHttpsEnabled());
-        Set<Node> nodes = new HashSet<>();
-        Node node = new Node();
-        node.setIp(serviceAddrInfo[0]);
-        node.setPort("9101");
-        /* Following codes will cause an unregistration from MSB (due to MSB malfunction), comment them for now
-        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);
     }
 }