You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/01/18 05:36:33 UTC
ignite git commit: IGNITE-843 Fixed agent logging.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 39c796eab -> 3405aba4a
IGNITE-843 Fixed agent logging.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3405aba4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3405aba4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3405aba4
Branch: refs/heads/ignite-843-rc2
Commit: 3405aba4acba587d7430f2380bec4e70927bbfe4
Parents: 39c796e
Author: Andrey <an...@gridgain.com>
Authored: Mon Jan 18 11:36:49 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Mon Jan 18 11:36:49 2016 +0700
----------------------------------------------------------------------
modules/control-center-agent/pom.xml | 12 ++++----
.../console/agent/handlers/RestExecutor.java | 4 +--
.../ignite/console/demo/AgentSqlDemo.java | 18 ++++++------
.../src/main/resources/log4j.properties | 29 ++++++++++++++++----
.../src/main/js/public/stylesheets/style.scss | 6 ++++
5 files changed, 48 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3405aba4/modules/control-center-agent/pom.xml
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/pom.xml b/modules/control-center-agent/pom.xml
index b90cec0..2fe8844 100644
--- a/modules/control-center-agent/pom.xml
+++ b/modules/control-center-agent/pom.xml
@@ -78,12 +78,12 @@
<groupId>org.apache.ignite</groupId>
<artifactId>ignite-rest-http</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.ignite</groupId>
- <artifactId>ignite-log4j</artifactId>
- </exclusion>
- </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.ignite</groupId>
+ <artifactId>ignite-log4j</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/ignite/blob/3405aba4/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java
index 14252a1..9b4c3a5 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java
@@ -89,7 +89,7 @@ public class RestExecutor {
@Remote
public RestResult executeRest(String uri, Map<String, String> params, boolean demo,
String mtd, Map<String, String> headers, String body) throws IOException, URISyntaxException {
- log.debug("Start execute REST command [method=" + mtd + ", uri=/" + uri + ", parameters=" + params + "]");
+ log.info("Start execute REST command [method=" + mtd + ", uri=/" + uri + ", parameters=" + params + "]");
if (demo)
AgentSqlDemo.testDrive(cfg);
@@ -162,7 +162,7 @@ public class RestExecutor {
return new RestResult(resp.getStatusLine().getStatusCode(), new String(out.toByteArray(), charset));
}
catch (ConnectException e) {
- log.debug("Failed connect to node and execute REST command [uri=" + builder.build() + "]");
+ log.info("Failed connect to node and execute REST command [uri=" + builder.build() + "]");
return new RestResult(404, "Failed connect to node and execute REST command.");
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/3405aba4/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java b/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
index 7e1d1ce..a471d25 100644
--- a/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
+++ b/modules/control-center-agent/src/main/java/org/apache/ignite/console/demo/AgentSqlDemo.java
@@ -46,13 +46,14 @@ import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteEx;
import org.apache.ignite.internal.util.typedef.F;
-import org.apache.ignite.logger.NullLogger;
+import org.apache.ignite.logger.log4j.Log4JLogger;
import org.apache.ignite.spi.IgniteSpiException;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinderAdapter;
import org.apache.log4j.Logger;
import static org.apache.ignite.IgniteSystemProperties.IGNITE_JETTY_PORT;
+import static org.apache.ignite.IgniteSystemProperties.IGNITE_NO_ASCII;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_JETTY_ADDRS;
import static org.apache.ignite.internal.IgniteNodeAttributes.ATTR_REST_JETTY_PORT;
@@ -318,7 +319,7 @@ public class AgentSqlDemo {
* @param range Time range in milliseconds.
*/
private static void populateCacheEmployee(Ignite ignite, long range) {
- log.trace("DEMO: Start employees population with data...");
+ log.debug("DEMO: Start employees population with data...");
IgniteCache<Integer, Country> cacheCountry = ignite.cache(COUNTRY_CACHE_NAME);
@@ -349,14 +350,14 @@ public class AgentSqlDemo {
new java.sql.Date((long)(r * range)), "Job employee #" + n, 500 + round(r * 2000, 2)));
}
- log.trace("DEMO: Finished employees population.");
+ log.debug("DEMO: Finished employees population.");
}
/**
* @param ignite Ignite.
*/
private static void populateCacheCar(Ignite ignite) {
- log.trace("DEMO: Start cars population...");
+ log.debug("DEMO: Start cars population...");
IgniteCache<Integer, Parking> cacheParking = ignite.cache(PARKING_CACHE_NAME);
@@ -368,7 +369,7 @@ public class AgentSqlDemo {
for (int i = 0, n = 1; i < CAR_CNT; i++, n++)
cacheCar.put(i, new Car(i, rnd.nextInt(PARK_CNT), "Car #" + n));
- log.trace("DEMO: Finished cars population.");
+ log.debug("DEMO: Finished cars population.");
}
/**
@@ -482,9 +483,9 @@ public class AgentSqlDemo {
cfg.setLocalHost("127.0.0.1");
- cfg.setMetricsLogFrequency(0);
+ cfg.setGridLogger(new Log4JLogger(log));
- cfg.setGridLogger(new NullLogger());
+ cfg.setMetricsLogFrequency(0);
// Configure discovery SPI.
TcpDiscoverySpi discoSpi = new TcpDiscoverySpi();
@@ -517,8 +518,9 @@ public class AgentSqlDemo {
cfg.setCacheConfiguration(cacheCountry(), cacheDepartment(), cacheEmployee(), cacheParking(), cacheCar());
System.setProperty(IGNITE_JETTY_PORT, "60800");
+ System.setProperty(IGNITE_NO_ASCII, "true");
- log.trace("DEMO: Start embedded node with indexed enabled caches...");
+ log.debug("DEMO: Start embedded node with indexed enabled caches...");
IgniteEx ignite = (IgniteEx)Ignition.start(cfg);
http://git-wip-us.apache.org/repos/asf/ignite/blob/3405aba4/modules/control-center-agent/src/main/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/src/main/resources/log4j.properties b/modules/control-center-agent/src/main/resources/log4j.properties
index c262a16..3b7767c 100644
--- a/modules/control-center-agent/src/main/resources/log4j.properties
+++ b/modules/control-center-agent/src/main/resources/log4j.properties
@@ -13,21 +13,40 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-log4j.rootLogger=INFO,stdout,file
+log4j.rootLogger=INFO,console_err,file
log4j.logger.org.apache.http=WARN
+log4j.logger.org.apache.ignite.spi.checkpoint.noop.NoopCheckpointSpi=OFF
+log4j.logger.org.apache.ignite.spi.swapspace.noop.NoopSwapSpaceSpi=OFF
+log4j.logger.org.apache.ignite.internal.managers.collision.GridCollisionManager=ERROR
log4j.logger.org.apache.commons.beanutils=WARN
log4j.logger.sun.net.www.protocol.http=WARN
# Configure console appender.
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n
+log4j.appender.console_err=org.apache.log4j.ConsoleAppender
+log4j.appender.console_err.Threshold=WARN
+log4j.appender.console_err.layout=org.apache.log4j.PatternLayout
+log4j.appender.console_err.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n
+
+# Configure console appender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern=[%d{ABSOLUTE}][%-5p][%t][%c{1}] %m%n
+log4j.appender.console.filter.a=org.apache.log4j.varia.LevelMatchFilter
+log4j.appender.console.filter.a.LevelToMatch=INFO
+log4j.appender.console.filter.a.AcceptOnMatch=true
+log4j.appender.console.filter.b=org.apache.log4j.varia.LevelMatchFilter
+log4j.appender.console.filter.b.LevelToMatch=ERROR
+log4j.appender.console.filter.b.AcceptOnMatch=false
+log4j.appender.console.filter.c=org.apache.log4j.varia.LevelMatchFilter
+log4j.appender.console.filter.c.LevelToMatch=WARN
+log4j.appender.console.filter.c.AcceptOnMatch=false
+
+log4j.category.org.apache.ignite.console=INFO,console
# Direct log messages to a log file
log4j.appender.file=org.apache.log4j.RollingFileAppender
log4j.appender.file.File=logs/ignite-web-agent.log
-log4j.appender.file.Threshold=DEBUG
log4j.appender.file.MaxFileSize=10MB
log4j.appender.file.MaxBackupIndex=10
log4j.appender.file.layout=org.apache.log4j.PatternLayout
http://git-wip-us.apache.org/repos/asf/ignite/blob/3405aba4/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index adfb478..5c3653d 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1865,6 +1865,12 @@ treecontrol.tree-classic {
}
}
+.grid.ui-grid {
+ border-left-width: 0;
+ border-right-width: 0;
+ border-bottom-width: 0;
+}
+
.summary-tabs {
.nav-tabs > li:first-child,
.nav-tabs > li:first-child.active {