svn commit: r1416640 - in /oozie/branches/branch-3.3: core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java release-log.txt

[mo...@apache.org]

Author: mona
Date: Mon Dec  3 19:00:54 2012
New Revision: 1416640

URL: http://svn.apache.org/viewvc?rev=1416640&view=rev
Log:
OOZIE-1099 Pig launcher log does not show the pig job url for H23 (rohini via mona)

Modified:
    oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
    oozie/branches/branch-3.3/release-log.txt

Modified: oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java?rev=1416640&r1=1416639&r2=1416640&view=diff
==============================================================================
--- oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java (original)
+++ oozie/branches/branch-3.3/core/src/main/java/org/apache/oozie/action/hadoop/PigMain.java Mon Dec  3 19:00:54 2012
@@ -166,14 +166,15 @@ public class PigMain extends LauncherMai
             // append required PIG properties to the default hadoop log4j file
             Properties hadoopProps = new Properties();
             hadoopProps.load(log4jFile.openStream());
+            hadoopProps.setProperty("log4j.rootLogger", pigLogLevel + ", A, B");
             hadoopProps.setProperty("log4j.logger.org.apache.pig", pigLogLevel + ", A, B");
             hadoopProps.setProperty("log4j.appender.A", "org.apache.log4j.ConsoleAppender");
             hadoopProps.setProperty("log4j.appender.A.layout", "org.apache.log4j.PatternLayout");
-            hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n");
+            hadoopProps.setProperty("log4j.appender.A.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n");
             hadoopProps.setProperty("log4j.appender.B", "org.apache.log4j.FileAppender");
             hadoopProps.setProperty("log4j.appender.B.file", logFile);
             hadoopProps.setProperty("log4j.appender.B.layout", "org.apache.log4j.PatternLayout");
-            hadoopProps.setProperty("log4j.appender.B.layout.ConversionPattern", "%-4r [%t] %-5p %c %x - %m%n");
+            hadoopProps.setProperty("log4j.appender.B.layout.ConversionPattern", "%d [%t] %-5p %c %x - %m%n");
 
             String localProps = new File("piglog4j.properties").getAbsolutePath();
             OutputStream os1 = new FileOutputStream(localProps);

Modified: oozie/branches/branch-3.3/release-log.txt
URL: http://svn.apache.org/viewvc/oozie/branches/branch-3.3/release-log.txt?rev=1416640&r1=1416639&r2=1416640&view=diff
==============================================================================
--- oozie/branches/branch-3.3/release-log.txt (original)
+++ oozie/branches/branch-3.3/release-log.txt Mon Dec  3 19:00:54 2012
@@ -1,5 +1,6 @@
 -- Oozie 3.3.0 release
 
+OOZIE-1099 Pig launcher log does not show the pig job url for H23 (rohini via mona)
 OOZIE-1100 HFTP coordinator input check fails due to missing commons-httpclient.jar (ryota via virag)
 OOZIE-1065 bundle status does not transit after rerun (virag)
 OOZIE-1064 Status value of coordinator job not reflected in bundle action and invalid transition of coordinator job (virag)