http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java ---------------------------------------------------------------------- diff --git a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java index 0f8e427..3dd6016 100644 --- a/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java +++ b/modules/log4j/src/main/java/org/apache/ignite/logger/log4j/IgniteLog4jNodeIdFilePath.java @@ -46,8 +46,8 @@ class IgniteLog4jNodeIdFilePath implements IgniteClosure<String, String> { /** {@inheritDoc} */ @Override public String apply(String oldPath) { - if (!F.isEmpty(U.GRIDGAIN_LOG_DIR)) - return U.nodeIdLogFileName(nodeId, new File(U.GRIDGAIN_LOG_DIR, "gridgain.log").getAbsolutePath()); + if (!F.isEmpty(U.IGNITE_LOG_DIR)) + return U.nodeIdLogFileName(nodeId, new File(U.IGNITE_LOG_DIR, "gridgain.log").getAbsolutePath()); if (oldPath != null) // fileName could be null if GRIDGAIN_HOME is not defined. return U.nodeIdLogFileName(nodeId, oldPath);
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/77efad96/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java ---------------------------------------------------------------------- diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java index d345e2a..4fc8a24 100644 --- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java +++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestProtocol.java @@ -268,7 +268,7 @@ public class GridJettyRestProtocol extends GridRestProtocolAdapter { srvPort = Integer.valueOf(srvPortStr); } catch (NumberFormatException ignore) { - throw new IgniteCheckedException("Failed to start Jetty server because GRIDGAIN_JETTY_PORT system property " + + throw new IgniteCheckedException("Failed to start Jetty server because IGNITE_JETTY_PORT system property " + "cannot be cast to integer: " + srvPortStr); }
