Skip to content

Commit 7cd582e

Browse files
Renamed logback-event-viewer.css to logback-event-viewer.html-head.
1 parent 83cb009 commit 7cd582e

File tree

3 files changed

+19
-17
lines changed

3 files changed

+19
-17
lines changed

logback-webapp-lib/src/main/java/ch/qos/logback/webapp/EventViewer.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void init (final ServletConfig configuration)
4646
throw (new ServletException (String.format (
4747
"logback event viewer `%s` parameter is not set; aborting!", EventViewer.appenderParameterName)));
4848
final String eventPattern = configuration.getInitParameter (EventViewer.eventPatternParameterName);
49-
final String cssResourceName = configuration.getInitParameter (EventViewer.cssResourceParameterName);
49+
final String htmlHeadResourceName = configuration.getInitParameter (EventViewer.htmlHeadResourceParameterName);
5050

5151
this.rootLogger = (Logger) LoggerFactory.getLogger (org.slf4j.Logger.ROOT_LOGGER_NAME);
5252
final LoggerContext context = this.rootLogger.getLoggerContext ();
@@ -61,19 +61,19 @@ public void init (final ServletConfig configuration)
6161
"logback event viewer `%s` parameter value `%s` is wrong (appender has wrong class `%s`)",
6262
EventViewer.appenderParameterName, appenderName, appender.getClass ().getName ())));
6363

64-
final InputStream cssStream;
65-
if (cssResourceName != null) {
66-
cssStream = EventViewer.class.getClassLoader ().getResourceAsStream (cssResourceName);
67-
if (cssStream == null)
64+
final InputStream htmlHeadStream;
65+
if (htmlHeadResourceName != null) {
66+
htmlHeadStream = EventViewer.class.getClassLoader ().getResourceAsStream (htmlHeadResourceName);
67+
if (htmlHeadStream == null)
6868
throw (new ServletException (String.format (
6969
"logback event viewer `%s` parameter value `%s` is wrong (no resource of such name found)",
70-
EventViewer.cssResourceParameterName, cssResourceName)));
70+
EventViewer.htmlHeadResourceParameterName, htmlHeadResourceName)));
7171
} else
72-
cssStream = EventViewer.class.getClassLoader ().getResourceAsStream (EventViewer.defaultCssResource);
73-
final StringBuffer css;
74-
if (cssStream != null) {
75-
css = new StringBuffer ();
76-
final BufferedReader cssReader = new BufferedReader (new InputStreamReader (cssStream));
72+
htmlHeadStream = EventViewer.class.getClassLoader ().getResourceAsStream (EventViewer.defaultHtmlHeadResource);
73+
final StringBuffer htmlHead;
74+
if (htmlHeadStream != null) {
75+
htmlHead = new StringBuffer ();
76+
final BufferedReader cssReader = new BufferedReader (new InputStreamReader (htmlHeadStream));
7777
final char[] buffer = new char[1024];
7878
while (true) {
7979
final int read;
@@ -84,15 +84,15 @@ public void init (final ServletConfig configuration)
8484
}
8585
if ((read == 0) || (read == -1))
8686
break;
87-
css.insert (css.length (), buffer, 0, read);
87+
htmlHead.insert (htmlHead.length (), buffer, 0, read);
8888
}
8989
try {
9090
cssReader.close ();
9191
} catch (final IOException exception) {
9292
throw (new ServletException (exception));
9393
}
9494
} else
95-
css = null;
95+
htmlHead = null;
9696

9797
super.init ();
9898

@@ -102,11 +102,11 @@ public void init (final ServletConfig configuration)
102102
this.layout.setContext (context);
103103
if (eventPattern != null)
104104
this.layout.setPattern (eventPattern);
105-
if (css != null) {
105+
if (htmlHead != null) {
106106
this.layout.setCssBuilder (new CssBuilder () {
107107
public void addCss (final StringBuilder sink)
108108
{
109-
sink.append (css);
109+
sink.append (htmlHead);
110110
}
111111
});
112112
}
@@ -151,8 +151,8 @@ protected void doGet (final HttpServletRequest request, final HttpServletRespons
151151
private Logger rootLogger;
152152

153153
public static final String appenderParameterName = "appender";
154-
public static final String cssResourceParameterName = "css-resource";
155-
public static final String defaultCssResource = "logback-event-viewer.css";
154+
public static final String htmlHeadResourceParameterName = "html-head-resource";
155+
public static final String defaultHtmlHeadResource = "logback-event-viewer.html-head";
156156
public static final String eventPatternParameterName = "event-pattern";
157157
private static final long serialVersionUID = 1L;
158158
}

logback-webapp-lib/src/main/resources/logback-event-viewer.css

Whitespace-only changes.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
<meta http-equiv="refresh" content="6" />

0 commit comments

Comments
 (0)