Code Review
/
holmes
/
rule-management.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Modify the Service Addr Query Logic
[holmes/rule-management.git]
/
rulemgt
/
src
/
main
/
java
/
org
/
onap
/
holmes
/
rulemgt
/
RuleActiveApp.java
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
a37c49c
..
7738366
100644
(file)
--- a/
rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
+++ b/
rulemgt/src/main/java/org/onap/holmes/rulemgt/RuleActiveApp.java
@@
-16,8
+16,6
@@
package org.onap.holmes.rulemgt;
package org.onap.holmes.rulemgt;
-import static jdk.nashorn.internal.runtime.regexp.joni.Config.log;
-
import io.dropwizard.setup.Environment;
import java.util.HashSet;
import java.util.Set;
import io.dropwizard.setup.Environment;
import java.util.HashSet;
import java.util.Set;
@@
-29,7
+27,7
@@
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.dropwizard.ioc.bundle.IOCApplication;
import org.onap.holmes.common.exception.CorrelationException;
import org.onap.holmes.common.utils.MSBRegisterUtil;
-import org.onap.holmes.rulemgt.dcae.D
ac
eConfigurationPolling;
+import org.onap.holmes.rulemgt.dcae.D
ca
eConfigurationPolling;
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.resources.RuleMgtResources;
import org.onap.msb.sdk.discovery.entity.MicroServiceInfo;
import org.onap.msb.sdk.discovery.entity.Node;
@@
-50,20
+48,20
@@
public class RuleActiveApp extends IOCApplication<RuleAppConfig> {
public void run(RuleAppConfig configuration, Environment environment) throws Exception {
super.run(configuration, environment);
public void run(RuleAppConfig configuration, Environment environment) throws Exception {
super.run(configuration, environment);
- ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
- service.scheduleAtFixedRate(new DaceConfigurationPolling("holmes-rule-mgmt"), 0,
- DaceConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
-
environment.jersey().register(new RuleMgtResources());
try {
new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
} catch (CorrelationException e) {
log.warn(e.getMessage(), e);
}
environment.jersey().register(new RuleMgtResources());
try {
new MSBRegisterUtil().register2Msb(createMicroServiceInfo());
} catch (CorrelationException e) {
log.warn(e.getMessage(), e);
}
+
+ ScheduledExecutorService service = Executors.newSingleThreadScheduledExecutor();
+ service.scheduleAtFixedRate(new DcaeConfigurationPolling("holmes-rule-mgmt"), 0,
+ DcaeConfigurationPolling.POLLING_PERIOD, TimeUnit.MILLISECONDS);
}
private MicroServiceInfo createMicroServiceInfo() {
}
private MicroServiceInfo createMicroServiceInfo() {
- String[] serviceAddrInfo = MicroServiceConfig.get
ServiceAddrInfo
();
+ String[] serviceAddrInfo = MicroServiceConfig.get
MicroServiceIpAndPort
();
MicroServiceInfo msinfo = new MicroServiceInfo();
msinfo.setServiceName("holmes-rule-mgmt");
msinfo.setVersion("v1");
MicroServiceInfo msinfo = new MicroServiceInfo();
msinfo.setServiceName("holmes-rule-mgmt");
msinfo.setVersion("v1");