You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/04/22 00:34:19 UTC
incubator-geode git commit: Debugging changes
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1255 afe7b0953 -> 90db0cbe5
Debugging changes
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/90db0cbe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/90db0cbe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/90db0cbe
Branch: refs/heads/feature/GEODE-1255
Commit: 90db0cbe50820fb11a8a348074b80d225bfd9716
Parents: afe7b09
Author: Kirk Lund <kl...@apache.org>
Authored: Thu Apr 21 15:34:01 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Thu Apr 21 15:34:01 2016 -0700
----------------------------------------------------------------------
.../java/com/gemstone/gemfire/distributed/LocatorLauncher.java | 6 ++++++
geode-core/src/main/resources/log4j2.xml | 2 +-
.../gemfire/distributed/LocatorLauncherRemoteJUnitTest.java | 2 +-
...og4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java | 6 +++---
.../gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml | 2 +-
5 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90db0cbe/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
index 24b859c..32e6bb2 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/LocatorLauncher.java
@@ -50,6 +50,7 @@ import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
import com.gemstone.gemfire.internal.lang.ObjectUtils;
import com.gemstone.gemfire.internal.lang.StringUtils;
import com.gemstone.gemfire.internal.lang.SystemUtils;
+import com.gemstone.gemfire.internal.logging.LogService;
import com.gemstone.gemfire.internal.process.ConnectionFailedException;
import com.gemstone.gemfire.internal.process.ControlNotificationHandler;
import com.gemstone.gemfire.internal.process.ControllableProcess;
@@ -511,6 +512,11 @@ public final class LocatorLauncher extends AbstractLauncher<String> {
switch (getCommand()) {
case START:
info(start());
+ // KIRK:
+ LogService.getLogger().info("KIRK: isUsingGemFireDefaultConfig=" + LogService.isUsingGemFireDefaultConfig());
+// if (LogService.isUsingGemFireDefaultConfig()) {
+// throw new AssertionError("isUsingGemFireDefaultConfig");
+// }
waitOnLocator();
break;
case STATUS:
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90db0cbe/geode-core/src/main/resources/log4j2.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/main/resources/log4j2.xml b/geode-core/src/main/resources/log4j2.xml
index 670c0f1..55669fe 100755
--- a/geode-core/src/main/resources/log4j2.xml
+++ b/geode-core/src/main/resources/log4j2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="FATAL" shutdownHook="disable" packages="com.gemstone.gemfire.internal.logging.log4j">
+<Configuration status="DEBUG" shutdownHook="disable" packages="com.gemstone.gemfire.internal.logging.log4j">
<Properties>
<Property name="gemfire-pattern">[%level{lowerCase=true} %date{yyyy/MM/dd HH:mm:ss.SSS z} <%thread> tid=%tid] %message%n%throwable%n</Property>
<Property name="gemfire-default">true</Property>
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90db0cbe/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
index 0b237c1..b9025bb 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/LocatorLauncherRemoteJUnitTest.java
@@ -221,7 +221,7 @@ public class LocatorLauncherRemoteJUnitTest extends AbstractLocatorLauncherJUnit
for (String jvmArgument : jvmArguments) {
command.add(jvmArgument);
}
- command.add("-D" + ConfigurationFactory.CONFIGURATION_FILE_PROPERTY + "/Users/klund/dev/gemfire/open/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml");
+ command.add("-D" + ConfigurationFactory.CONFIGURATION_FILE_PROPERTY + "=/Users/klund/dev/gemfire/open/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml");
command.add("-cp");
command.add(System.getProperty("java.class.path"));
command.add(LocatorLauncher.class.getName());
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90db0cbe/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java
index e3a6428..92a5608 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/custom/Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest.java
@@ -98,10 +98,10 @@ public class Custom_log4j2_xml_MinimalistWithLocatorLauncherIntegrationTest {
public void foo() throws Exception {
LocatorLauncher launcher = new LocatorLauncher.Builder()
.setCommand(LocatorLauncher.Command.START)
- .set(DistributionConfig.LOCATORS_NAME, "")
- .set(DistributionConfig.MCAST_PORT_NAME, "0")
.setMemberName("membername")
- .setPort(AvailablePort.getRandomAvailablePort(AvailablePort.MULTICAST))
+ //.set(DistributionConfig.LOCATORS_NAME, "")
+ .setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET))
+ .setRedirectOutput(true)
.build();
launcher.start();
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90db0cbe/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml b/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml
index 27a9757..a9324db 100644
--- a/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/internal/logging/log4j/custom/log4j2.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<Configuration status="FATAL" shutdownHook="disable" packages="com.gemstone.gemfire.internal.logging.log4j.custom">
+<Configuration status="DEBUG" shutdownHook="disable" packages="com.gemstone.gemfire.internal.logging.log4j.custom">
<Appenders>
<Console name="STDOUT" target="SYSTEM_OUT">
<PatternLayout pattern="%level %date{yyyy/MM/dd HH:mm:ss.SSS z} %message%n %throwable%n"/>