You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/12/09 17:27:48 UTC
[2/5] incubator-tinkerpop git commit: Moved extra logging config to
properties files.
Moved extra logging config to properties files.
Modified in giraph and spark plugins.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/23f4c343
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/23f4c343
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/23f4c343
Branch: refs/heads/master
Commit: 23f4c343fcfc127c49225446e88998882a468d3d
Parents: b9efcb6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Dec 9 06:02:40 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Dec 9 06:02:40 2015 -0500
----------------------------------------------------------------------
.../gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java | 1 -
gremlin-console/conf/log4j-console.properties | 4 +++-
gremlin-server/conf/log4j-server.properties | 2 ++
.../gremlin/spark/groovy/plugin/SparkGremlinPlugin.java | 9 ---------
4 files changed, 5 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23f4c343/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java
----------------------------------------------------------------------
diff --git a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java
index a4778b4..ba882f5 100644
--- a/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java
+++ b/giraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/giraph/groovy/plugin/GiraphGremlinPlugin.java
@@ -38,7 +38,6 @@ public final class GiraphGremlinPlugin extends AbstractGremlinPlugin {
protected static String NAME = "tinkerpop.giraph";
protected static final Set<String> IMPORTS = new HashSet<String>() {{
- add("import org.apache.log4j.*");
add(IMPORT_SPACE + GiraphGraphComputer.class.getPackage().getName() + DOT_STAR);
}};
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23f4c343/gremlin-console/conf/log4j-console.properties
----------------------------------------------------------------------
diff --git a/gremlin-console/conf/log4j-console.properties b/gremlin-console/conf/log4j-console.properties
index ea08fdf..8e1b2e0 100644
--- a/gremlin-console/conf/log4j-console.properties
+++ b/gremlin-console/conf/log4j-console.properties
@@ -23,4 +23,6 @@ log4j.appender.stdout.layout.ConversionPattern=%-5p %c %x - %m%n
log4j.logger.org.apache.hadoop.mapred.JobClient=INFO
log4j.logger.org.apache.hadoop.mapreduce.Job=INFO
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapReduceGraphComputer=INFO
-log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
\ No newline at end of file
+log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
+log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO
+log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23f4c343/gremlin-server/conf/log4j-server.properties
----------------------------------------------------------------------
diff --git a/gremlin-server/conf/log4j-server.properties b/gremlin-server/conf/log4j-server.properties
index f967d26..2529887 100644
--- a/gremlin-server/conf/log4j-server.properties
+++ b/gremlin-server/conf/log4j-server.properties
@@ -27,3 +27,5 @@ log4j.logger.org.apache.hadoop.mapred.JobClient=INFO
log4j.logger.org.apache.hadoop.mapreduce.Job=INFO
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.process.computer.mapreduce.MapReduceGraphComputer=INFO
log4j.logger.org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph=INFO
+log4j.logger.org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer=INFO
+log4j.logger.org.apache.spark.metrics.MetricsSystem=ERROR
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/23f4c343/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
index af6d421..083311a 100644
--- a/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
+++ b/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/groovy/plugin/SparkGremlinPlugin.java
@@ -19,14 +19,12 @@
package org.apache.tinkerpop.gremlin.spark.groovy.plugin;
-import org.apache.spark.metrics.MetricsSystem;
import org.apache.tinkerpop.gremlin.groovy.plugin.AbstractGremlinPlugin;
import org.apache.tinkerpop.gremlin.groovy.plugin.IllegalEnvironmentException;
import org.apache.tinkerpop.gremlin.groovy.plugin.PluginAcceptor;
import org.apache.tinkerpop.gremlin.groovy.plugin.PluginInitializationException;
import org.apache.tinkerpop.gremlin.groovy.plugin.RemoteAcceptor;
import org.apache.tinkerpop.gremlin.spark.process.computer.SparkGraphComputer;
-import org.slf4j.Logger;
import java.util.HashSet;
import java.util.Optional;
@@ -40,7 +38,6 @@ public final class SparkGremlinPlugin extends AbstractGremlinPlugin {
protected static String NAME = "tinkerpop.spark";
protected static final Set<String> IMPORTS = new HashSet<String>() {{
- add("import org.apache.log4j.*");
add(IMPORT_SPACE + SparkGraphComputer.class.getPackage().getName() + DOT_STAR);
}};
@@ -52,12 +49,6 @@ public final class SparkGremlinPlugin extends AbstractGremlinPlugin {
@Override
public void afterPluginTo(final PluginAcceptor pluginAcceptor) throws PluginInitializationException, IllegalEnvironmentException {
pluginAcceptor.addImports(IMPORTS);
- try {
- pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.INFO)", SparkGraphComputer.class.getName()));
- pluginAcceptor.eval(String.format("Logger.getLogger(%s).setLevel(Level.ERROR)", MetricsSystem.class.getName()));
- } catch (final Exception e) {
- throw new PluginInitializationException(e.getMessage(), e);
- }
}
@Override