honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename jmx settings to conform with casing (old casing also works)

This commit is contained in:
kimchy 2010-08-04 22:27:26 +03:00
parent 8c5fdf4aee
commit 860d8058b6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxModule.java
View File

@ -30,7 +30,7 @@ import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.jmx.action.GetJmxServiceUrlAction; import org.elasticsearch.jmx.action.GetJmxServiceUrlAction;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (shay.banon)
*/ */
public class JmxModule extends AbstractModule { public class JmxModule extends AbstractModule {

10
modules/elasticsearch/src/main/java/org/elasticsearch/jmx/JmxService.java
View File

@ -37,13 +37,13 @@ import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
/** /**
* @author kimchy (Shay Banon) * @author kimchy (shay.banon)
*/ */
public class JmxService { public class JmxService {
public static class SettingsConstants { public static class SettingsConstants {
public static final String CREATE_CONNECTOR = "jmx.createConnector"; public static final String CREATE_CONNECTOR = "jmx.create_connector";
} }
// we use {jmx.port} without prefix of $ since we don't want it to be resolved as a setting property // we use {jmx.port} without prefix of $ since we don't want it to be resolved as a setting property
@ -106,7 +106,7 @@ public class JmxService {
@Override public boolean onPortNumber(int portNumber) { @Override public boolean onPortNumber(int portNumber) {
try { try {
LocateRegistry.createRegistry(portNumber); LocateRegistry.createRegistry(portNumber);
serviceUrl = settings.get("jmx.serviceUrl", JMXRMI_URI_PATTERN).replace("{jmx.port}", Integer.toString(portNumber)); serviceUrl = settings.get("jmx.service_url", JMXRMI_URI_PATTERN).replace("{jmx.port}", Integer.toString(portNumber));
// Create the JMX service URL. // Create the JMX service URL.
JMXServiceURL url = new JMXServiceURL(serviceUrl); JMXServiceURL url = new JMXServiceURL(serviceUrl);
// Create the connector server now. // Create the connector server now.
@ -114,8 +114,8 @@ public class JmxService {
connectorServer.start(); connectorServer.start();
// create the publish url // create the publish url
String publishHost = networkService.resolvePublishHostAddress(settings.get("jmx.publishHost")).getHostAddress(); String publishHost = networkService.resolvePublishHostAddress(settings.get("jmx.publish_host")).getHostAddress();
publishUrl = settings.get("jmx.publishUrl", JMXRMI_PUBLISH_URI_PATTERN).replace("{jmx.port}", Integer.toString(portNumber)).replace("{jmx.host}", publishHost); publishUrl = settings.get("jmx.publish_url", JMXRMI_PUBLISH_URI_PATTERN).replace("{jmx.port}", Integer.toString(portNumber)).replace("{jmx.host}", publishHost);
} catch (Exception e) { } catch (Exception e) {
lastException.set(e); lastException.set(e);
return false; return false;