Skip to content

[cli] Optional colorized outputs #5193

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

Merged
jimschubert merged 1 commit into from
Feb 2, 2020
Merged

[cli] Optional colorized outputs #5193

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions modules/openapi-generator-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -134,6 +144,11 @@
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
</dependency>
<dependency>
<groupId>org.codehaus.janino</groupId>
<artifactId>janino</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
Expand Down
84 changes: 77 additions & 7 deletions modules/openapi-generator-cli/src/main/resources/logback.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>

<!-- Prevent startup messages from Logback -->
<statusListener class="ch.qos.logback.core.status.NopStatusListener" />

<!-- For those without color (the default) -->
<property name="noColorPattern"
value="[%thread] %-5level %logger{36} - %msg%n" />
<!-- For those with color (with -Dcolor set) -->
<property name="colorPattern"
value="[%thread] %highlight(%-5level) %logger{36} - %msg%n" />

<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<target>System.out</target>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
<pattern>${noColorPattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
Expand All @@ -14,21 +25,80 @@
<appender name="STDERR" class="ch.qos.logback.core.ConsoleAppender">
<target>System.err</target>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>[%thread] %-5level %logger{36} - %msg%n</pattern>
<pattern>${noColorPattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
</appender>
<appender name="STDOUT_COLOR" class="ch.qos.logback.core.ConsoleAppender">
<target>System.out</target>
<withJansi>true</withJansi>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${colorPattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
<onMatch>DENY</onMatch>
<onMismatch>NEUTRAL</onMismatch>
</filter>
</appender>
<appender name="STDERR_COLOR" class="ch.qos.logback.core.ConsoleAppender">
<target>System.err</target>
<withJansi>true</withJansi>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>${colorPattern}</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
</appender>
<appender name="ONCELOGGER_COLOR" class="ch.qos.logback.core.ConsoleAppender">
<target>System.err</target>
<withJansi>true</withJansi>
<evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
<marker>ONCE</marker>
</evaluator>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>[%thread] %highlight(%-5level) %logger{36} - %red(%msg)%n</pattern>
</encoder>
</appender>

<logger name="io.swagger" level="warn">
<appender-ref ref="STDOUT"/>
<appender-ref ref="STDERR"/>
<!-- Colorize by passing -Dcolor -->
<if condition='isDefined("color")'>
<then>
<appender-ref ref="STDOUT_COLOR"/>
<appender-ref ref="STDERR_COLOR"/>
</then>
<else>
<appender-ref ref="STDOUT"/>
<appender-ref ref="STDERR"/>
</else>
</if>
</logger>
<logger name="org.openapitools" level="${log.level:-info}">
<appender-ref ref="STDOUT"/>
<appender-ref ref="STDERR"/>
<!-- Colorize by passing -Dcolor -->
<if condition='isDefined("color")'>
<then>
<appender-ref ref="STDOUT_COLOR"/>
<appender-ref ref="STDERR_COLOR"/>
</then>
<else>
<appender-ref ref="STDOUT"/>
<appender-ref ref="STDERR"/>
</else>
</if>
</logger>
<root level="error">
<appender-ref ref="STDERR"/>
<!-- Colorize by passing -Dcolor -->
<if condition='isDefined("color")'>
<then>
<appender-ref ref="STDERR_COLOR"/>
</then>
<else>
<appender-ref ref="STDERR"/>
</else>
</if>
</root>
</configuration>