Skip to content

CASSANDRA-20698 Fix the internal console appender logger used to test cli tools #4254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions test/unit/org/apache/cassandra/ConsoleAppender.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,32 +49,41 @@ public String getTarget()
@Override
public void start()
{
final PrintStream targetStream = target.equals("System.out") ? LogbackStatusListener.originalOut : LogbackStatusListener.originalErr;
setOutputStream(new OutputStream() {
@Override
public void write(int b)
{
targetStream.write(b);
resolveTargetStream(target).write(b);
}

@Override
public void write(byte[] b) throws IOException
{
targetStream.write(b);
resolveTargetStream(target).write(b);
}

@Override
public void write(byte[] b, int off, int len)
{
targetStream.write(b, off, len);
resolveTargetStream(target).write(b, off, len);
}

@Override
public void flush()
{
targetStream.flush();
resolveTargetStream(target).flush();
}
});
super.start();
}

private static PrintStream resolveTargetStream(String target)
{
if (target.equals("System.out"))
return System.out;
else if (target.equals("System.err"))
return System.err;
else
throw new IllegalArgumentException("Target must be either 'System.out' or 'System.err'");
}
}