@@ -46,7 +46,7 @@ public void init (final ServletConfig configuration)
46
46
throw (new ServletException (String .format (
47
47
"logback event viewer `%s` parameter is not set; aborting!" , EventViewer .appenderParameterName )));
48
48
final String eventPattern = configuration .getInitParameter (EventViewer .eventPatternParameterName );
49
- final String cssResourceName = configuration .getInitParameter (EventViewer .cssResourceParameterName );
49
+ final String htmlHeadResourceName = configuration .getInitParameter (EventViewer .htmlHeadResourceParameterName );
50
50
51
51
this .rootLogger = (Logger ) LoggerFactory .getLogger (org .slf4j .Logger .ROOT_LOGGER_NAME );
52
52
final LoggerContext context = this .rootLogger .getLoggerContext ();
@@ -61,19 +61,19 @@ public void init (final ServletConfig configuration)
61
61
"logback event viewer `%s` parameter value `%s` is wrong (appender has wrong class `%s`)" ,
62
62
EventViewer .appenderParameterName , appenderName , appender .getClass ().getName ())));
63
63
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 )
68
68
throw (new ServletException (String .format (
69
69
"logback event viewer `%s` parameter value `%s` is wrong (no resource of such name found)" ,
70
- EventViewer .cssResourceParameterName , cssResourceName )));
70
+ EventViewer .htmlHeadResourceParameterName , htmlHeadResourceName )));
71
71
} 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 ));
77
77
final char [] buffer = new char [1024 ];
78
78
while (true ) {
79
79
final int read ;
@@ -84,15 +84,15 @@ public void init (final ServletConfig configuration)
84
84
}
85
85
if ((read == 0 ) || (read == -1 ))
86
86
break ;
87
- css .insert (css .length (), buffer , 0 , read );
87
+ htmlHead .insert (htmlHead .length (), buffer , 0 , read );
88
88
}
89
89
try {
90
90
cssReader .close ();
91
91
} catch (final IOException exception ) {
92
92
throw (new ServletException (exception ));
93
93
}
94
94
} else
95
- css = null ;
95
+ htmlHead = null ;
96
96
97
97
super .init ();
98
98
@@ -102,11 +102,11 @@ public void init (final ServletConfig configuration)
102
102
this .layout .setContext (context );
103
103
if (eventPattern != null )
104
104
this .layout .setPattern (eventPattern );
105
- if (css != null ) {
105
+ if (htmlHead != null ) {
106
106
this .layout .setCssBuilder (new CssBuilder () {
107
107
public void addCss (final StringBuilder sink )
108
108
{
109
- sink .append (css );
109
+ sink .append (htmlHead );
110
110
}
111
111
});
112
112
}
@@ -151,8 +151,8 @@ protected void doGet (final HttpServletRequest request, final HttpServletRespons
151
151
private Logger rootLogger ;
152
152
153
153
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 " ;
156
156
public static final String eventPatternParameterName = "event-pattern" ;
157
157
private static final long serialVersionUID = 1L ;
158
158
}
0 commit comments