Skip to content
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.

Sign up for GitHub

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

Jump to bottom

feat: display errors in CLI in red text #4509

Merged
merged 3 commits into from Feb 25, 2020
Merged

feat: display errors in CLI in red text #4509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8b76a6
display errors in CLI in red text
blueedgenick Feb 10, 2020
ef2516a
fix import arranging
blueedgenick Feb 13, 2020
c6a1239
fix silly test
blueedgenick Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion ksql-cli/src/main/java/io/confluent/ksql/cli/Cli.java
View file
Open in desktop
Expand Up @@ -175,7 +175,8 @@ public void runInteractively() {
eof = true;
} catch (final Exception exception) {
LOGGER.error("", exception);
terminal.writer().println(ErrorMessageUtil.buildErrorMessage(exception));
terminal.printError(ErrorMessageUtil.buildErrorMessage(exception),
exception.toString());
}
terminal.flush();
}
Expand Down
2 changes: 1 addition & 1 deletion ksql-cli/src/main/java/io/confluent/ksql/cli/console/Console.java
View file
Open in desktop
Expand Up @@ -322,7 +322,7 @@ public void printErrorMessage(final KsqlErrorMessage errorMessage) {

public void printError(final String shortMsg, final String fullMsg) {
log.error(fullMsg);
writer().println(shortMsg);
terminal.printError(shortMsg);
}

public void printStreamedRow(final StreamedRow row) {
Expand Down
7 changes: 7 additions & 0 deletions ksql-cli/src/main/java/io/confluent/ksql/cli/console/JLineTerminal.java
View file
Open in desktop
Expand Up @@ -153,6 +153,13 @@ public StatusClosable setStatusMessage(final String message) {
return () -> updateStatusBar(DEFAULT_STATUS_MSG);
}

@Override
public void printError(final String message) {
writer().println(
new AttributedString(message, AttributedStyle.DEFAULT.foreground(AttributedStyle.RED))
.toAnsi());
}

@VisibleForTesting
Terminal getTerminal() {
return terminal;
Expand Down
3 changes: 3 additions & 0 deletions ksql-cli/src/main/java/io/confluent/ksql/cli/console/KsqlTerminal.java
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@ public interface KsqlTerminal {
@FunctionalInterface
interface StatusClosable extends Closeable {

@Override
void close();
}

Expand All @@ -58,6 +59,8 @@ interface StatusClosable extends Closeable {
*/
StatusClosable setStatusMessage(String message);

void printError(String message);

void close();

class HistoryEntry {
Expand Down
6 changes: 5 additions & 1 deletion ksql-cli/src/test/java/io/confluent/ksql/TestTerminal.java
View file
Open in desktop
Expand Up @@ -16,7 +16,6 @@
package io.confluent.ksql;

import io.confluent.ksql.cli.console.KsqlTerminal;
import java.io.File;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.io.Writer;
Expand Down Expand Up @@ -95,4 +94,9 @@ public void unsetSpool() {
public StatusClosable setStatusMessage(final String message) {
return () -> {};
}

@Override
public void printError(final String message) {
writer().println(message);
}
}