You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pig.apache.org by da...@apache.org on 2010/10/19 07:11:00 UTC

svn commit: r1024113 - in /pig/branches/branch-0.8: CHANGES.txt src/org/apache/pig/Main.java src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java

Author: daijy
Date: Tue Oct 19 05:10:59 2010
New Revision: 1024113

URL: http://svn.apache.org/viewvc?rev=1024113&view=rev
Log:
PIG-1542: log level not propogated to MR task loggers

Modified:
    pig/branches/branch-0.8/CHANGES.txt
    pig/branches/branch-0.8/src/org/apache/pig/Main.java
    pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java

Modified: pig/branches/branch-0.8/CHANGES.txt
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.8/CHANGES.txt?rev=1024113&r1=1024112&r2=1024113&view=diff
==============================================================================
--- pig/branches/branch-0.8/CHANGES.txt (original)
+++ pig/branches/branch-0.8/CHANGES.txt Tue Oct 19 05:10:59 2010
@@ -200,6 +200,8 @@ PIG-1309: Map-side Cogroup (ashutoshc)
 
 BUG FIXES
 
+PIG-1542: log level not propogated to MR task loggers (nrai via daijy)
+
 PIG-1673: query with consecutive union-onschema statement errors out (thejas)
 
 PIG-1653: Scripting UDF fails if the path to script is an absolute path (daijy)

Modified: pig/branches/branch-0.8/src/org/apache/pig/Main.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.8/src/org/apache/pig/Main.java?rev=1024113&r1=1024112&r2=1024113&view=diff
==============================================================================
--- pig/branches/branch-0.8/src/org/apache/pig/Main.java (original)
+++ pig/branches/branch-0.8/src/org/apache/pig/Main.java Tue Oct 19 05:10:59 2010
@@ -602,7 +602,7 @@ private static void configureLog4J(Prope
     PropertyConfigurator.configure(props);
     logLevel = Logger.getLogger("org.apache.pig").getLevel();
     Properties backendProps = pigContext.getLog4jProperties();
-    backendProps.setProperty("log4j.logger.org.apache.pig.level", logLevel.toString());
+    backendProps.setProperty("log4j.logger.org.apache.pig", logLevel.toString());
     pigContext.setLog4jProperties(backendProps);
     pigContext.setDefaultLogLevel(logLevel);
 }

Modified: pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java
URL: http://svn.apache.org/viewvc/pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java?rev=1024113&r1=1024112&r2=1024113&view=diff
==============================================================================
--- pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java (original)
+++ pig/branches/branch-0.8/src/org/apache/pig/backend/hadoop/executionengine/mapReduceLayer/PigMapReduce.java Tue Oct 19 05:10:59 2010
@@ -295,8 +295,6 @@ public class PigMapReduce {
             try {
                 PigContext.setPackageImportList((ArrayList<String>)ObjectSerializer.deserialize(jConf.get("udf.import.list")));
                 pigContext = (PigContext)ObjectSerializer.deserialize(jConf.get("pig.pigContext"));
-                if (pigContext.getLog4jProperties()!=null)
-                    PropertyConfigurator.configure(pigContext.getLog4jProperties());
                 
                 rp = (PhysicalPlan) ObjectSerializer.deserialize(jConf
                         .get("pig.reducePlan"));