HTRACE-315. htraced: change default web port from 9095 to 9096 (cmccabe)
diff --git a/htrace-c/src/core/conf.c b/htrace-c/src/core/conf.c
index c004fad..fd5264f 100644
--- a/htrace-c/src/core/conf.c
+++ b/htrace-c/src/core/conf.c
@@ -33,7 +33,7 @@
";" HTRACED_WRITE_TIMEO_MS_KEY "=60000"\
";" HTRACED_READ_TIMEO_MS_KEY "=60000"\
";" HTRACE_TRACER_ID "=%{tname}/%{ip}"\
- ";" HTRACED_ADDRESS_KEY "=localhost:9095"\
+ ";" HTRACED_ADDRESS_KEY "=localhost:9096"\
";" HTRACED_BUFFER_SEND_TRIGGER_FRACTION "=0.50"\
)
diff --git a/htrace-htraced/example/htraced-conf.xml b/htrace-htraced/example/htraced-conf.xml
index ba23e6b..eb61ada 100644
--- a/htrace-htraced/example/htraced-conf.xml
+++ b/htrace-htraced/example/htraced-conf.xml
@@ -27,7 +27,7 @@
</property>
<property>
<name>web.address</name>
- <value>localhost:9095</value>
+ <value>localhost:9096</value>
</property>
<property>
<name>data.store.directories</name>
diff --git a/htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go b/htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go
index 6f6e8cf..9f3bc61 100644
--- a/htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go
+++ b/htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go
@@ -45,7 +45,7 @@
const HTRACE_WEB_ADDRESS = "web.address"
// The default port for the Htrace web address.
-const HTRACE_WEB_ADDRESS_DEFAULT_PORT = 9095
+const HTRACE_WEB_ADDRESS_DEFAULT_PORT = 9096
// The web address to start the REST server on.
const HTRACE_HRPC_ADDRESS = "hrpc.address"
diff --git a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedReceiverConf.java b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedReceiverConf.java
index bf038f1..46040dc 100644
--- a/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedReceiverConf.java
+++ b/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedReceiverConf.java
@@ -46,9 +46,9 @@
addr = new Conf(
HTraceConfiguration.fromKeyValuePairs(
- Conf.ADDRESS_KEY, "[ff02:0:0:0:0:0:0:12]:9095")).endpoint;
+ Conf.ADDRESS_KEY, "[ff02:0:0:0:0:0:0:12]:9096")).endpoint;
Assert.assertEquals("ff02:0:0:0:0:0:0:12", addr.getHostName());
- Assert.assertEquals(9095, addr.getPort());
+ Assert.assertEquals(9096, addr.getPort());
}
private static void verifyFail(String hostPort) {
@@ -67,7 +67,7 @@
verifyFail("localhost"); // no port
verifyFail("127.0.0.1"); // no port
verifyFail(":8080"); // no hostname
- verifyFail("bob[ff02:0:0:0:0:0:0:12]:9095"); // bracket at incorrect place
+ verifyFail("bob[ff02:0:0:0:0:0:0:12]:9096"); // bracket at incorrect place
}
@Test(timeout = 60000)
