Attachment #12643 for bug #31056

View | Details | Raw Unified | Return to bug 31056
Collapse All | Expand All





package org.apache.log4j;

import java.io.OutputStream;
import java.io.OutputStreamWriter;
import org.apache.log4j.helpers.LogLog;
import org.apache.log4j.spi.LoggingEvent;

/**
  * ConsoleAppender appends log events to <code>System.out</code> or

  public static final String SYSTEM_ERR = "System.err";

  protected String target = SYSTEM_OUT;
  protected OutputStream storedConsoleStream = null;

  /**
     The default constructor does nothing.

  }

  public ConsoleAppender(Layout layout, String target) {
    setLayout(layout);
    setTarget(target);
    setConsoleStream();
      setWriter(new OutputStreamWriter(System.out));
    } else if (SYSTEM_ERR.equalsIgnoreCase(target)) {
      setWriter(new OutputStreamWriter(System.err));
    } else {
      targetWarn(target);
    }
  }

  /**


  public
  void activateOptions() {
    setConsoleStream();
  }

  protected
  void setConsoleStream() {
    OutputStream stream;
    if(target.equals(SYSTEM_OUT)) {
      stream = System.out;
    } else {
      stream = System.err;
    }

    if(storedConsoleStream != stream) {
      storedConsoleStream = stream;
      setWriter(new OutputStreamWriter(stream));
    }
  }

  public
  void append(LoggingEvent event) {
    setConsoleStream();
    super.append(event);
  }

  /**

Return to bug 31056

Lines 7-14 Link Here

(-)jakarta-log4j-1.2.8/src/java/org/apache/log4j/ConsoleAppender.java (-11 / +25 lines)
7		7
8	package org.apache.log4j;	8	package org.apache.log4j;
9		9
		10	import java.io.OutputStream;
10	import java.io.OutputStreamWriter;	11	import java.io.OutputStreamWriter;
11	import org.apache.log4j.helpers.LogLog;	12	import org.apache.log4j.helpers.LogLog;
		13	import org.apache.log4j.spi.LoggingEvent;
12		14
13	/**	15	/**
14	* ConsoleAppender appends log events to <code>System.out</code> or	16	* ConsoleAppender appends log events to <code>System.out</code> or
Lines 23-28 Link Here
23	public static final String SYSTEM_ERR = "System.err";	25	public static final String SYSTEM_ERR = "System.err";
24		26
25	protected String target = SYSTEM_OUT;	27	protected String target = SYSTEM_OUT;
		28	protected OutputStream storedConsoleStream = null;
26		29
27	/**	30	/**
28	The default constructor does nothing.	31	The default constructor does nothing.
Lines 35-49 Link Here
35	}	38	}
36		39
37	public ConsoleAppender(Layout layout, String target) {	40	public ConsoleAppender(Layout layout, String target) {
38	this.layout = layout;	41	setLayout(layout);
39		42	setTarget(target);
40	if (SYSTEM_OUT.equals(target)) {	43	setConsoleStream();
41	setWriter(new OutputStreamWriter(System.out));
42	} else if (SYSTEM_ERR.equalsIgnoreCase(target)) {
43	setWriter(new OutputStreamWriter(System.err));
44	} else {
45	targetWarn(target);
46	}
47	}	44	}
48		45
49	/**	46	/**
Lines 82-92 Link Here
82		79
83	public	80	public
84	void activateOptions() {	81	void activateOptions() {
		82	setConsoleStream();
		83	}
		84
		85	protected
		86	void setConsoleStream() {
		87	OutputStream stream;
85	if(target.equals(SYSTEM_OUT)) {	88	if(target.equals(SYSTEM_OUT)) {
86	setWriter(new OutputStreamWriter(System.out));	89	stream = System.out;
87	} else {	90	} else {
88	setWriter(new OutputStreamWriter(System.err));	91	stream = System.err;
89	}	92	}
		93
		94	if(storedConsoleStream != stream) {
		95	storedConsoleStream = stream;
		96	setWriter(new OutputStreamWriter(stream));
		97	}
		98	}
		99
		100	public
		101	void append(LoggingEvent event) {
		102	setConsoleStream();
		103	super.append(event);
90	}	104	}
91		105
92	/**	106	/**