htrace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmcc...@apache.org
Subject incubator-htrace git commit: HTRACE-315. htraced: change default web port from 9095 to 9096 (cmccabe)
Date Fri, 04 Dec 2015 19:59:16 GMT
Repository: incubator-htrace
Updated Branches:
  refs/heads/master 8c82f6708 -> c101f40ed


HTRACE-315. htraced: change default web port from 9095 to 9096 (cmccabe)


Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/c101f40e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/c101f40e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/c101f40e

Branch: refs/heads/master
Commit: c101f40edcfbf5abdf52929ce8c962247ad28f24
Parents: 8c82f67
Author: Colin P. Mccabe <cmccabe@apache.org>
Authored: Wed Dec 2 18:51:32 2015 -0800
Committer: Colin P. Mccabe <cmccabe@apache.org>
Committed: Fri Dec 4 11:59:05 2015 -0800

----------------------------------------------------------------------
 htrace-c/src/core/conf.c                                       | 2 +-
 htrace-htraced/example/htraced-conf.xml                        | 2 +-
 htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go    | 2 +-
 .../java/org/apache/htrace/impl/TestHTracedReceiverConf.java   | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/c101f40e/htrace-c/src/core/conf.c
----------------------------------------------------------------------
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"\
     )
 

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/c101f40e/htrace-htraced/example/htraced-conf.xml
----------------------------------------------------------------------
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>

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/c101f40e/htrace-htraced/go/src/org/apache/htrace/conf/config_keys.go
----------------------------------------------------------------------
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 HTRACED_CONF_DIR = "HTRACED_CONF_DIR"
 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"

http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/c101f40e/htrace-htraced/src/test/java/org/apache/htrace/impl/TestHTracedReceiverConf.java
----------------------------------------------------------------------
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 @@ public class TestHTracedReceiverConf {
 
     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 @@ public class TestHTracedReceiverConf {
     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)


Mime
View raw message