[Fedora-directory-commits] admservconsole/src/com/netscape/management/admserv/logging ErrorLogViewerModel.java, 1.2, 1.3
Richard Allen Megginson
rmeggins at fedoraproject.org
Wed Dec 10 14:57:15 UTC 2008
Author: rmeggins
Update of /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2743/admservconsole/src/com/netscape/management/admserv/logging
Modified Files:
ErrorLogViewerModel.java
Log Message:
Resolves: bug 429514
Bug Description: Administration Server Console : incorrect apache server error log parsing
Reviewed by: nkinder (Thanks!)
Fix Description: The error log date/time are together in one field. Just combine them into one column in the log viewer.
New screenshot - https://bugzilla.redhat.com/attachment.cgi?id=326443
Platforms tested: RHEL5
Flag Day: no
Doc impact: yes - will have to document the new log format
Index: ErrorLogViewerModel.java
===================================================================
RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ErrorLogViewerModel.java 9 Jul 2007 20:10:10 -0000 1.2
+++ ErrorLogViewerModel.java 10 Dec 2008 14:57:13 -0000 1.3
@@ -50,8 +50,7 @@
_password = _consoleInfo.getAuthenticationPassword();
addColumn(_resource.getString("log", "lineno"));
- addColumn(_resource.getString("log", "date"));
- addColumn(_resource.getString("log", "time"));
+ addColumn(_resource.getString("log", "datetime"));
addColumn(_resource.getString("log", "severity"));
addColumn(_resource.getString("log", "details"));
@@ -126,10 +125,9 @@
class ErrorLogDataClient extends AbstractCommClient {
final int STATE_START = 0;
- final int STATE_DATE = 1;
- final int STATE_TIME = 2;
- final int STATE_SEVERITY = 3;
- final int STATE_DETAIL = 4;
+ final int STATE_DATETIME = 1;
+ final int STATE_SEVERITY = 2;
+ final int STATE_DETAIL = 3;
protected LogViewerModel _model;
public ErrorLogDataClient(String username, String password) {
@@ -137,8 +135,7 @@
}
class ErrorLogData {
- StringBuffer date = new StringBuffer();
- StringBuffer time = new StringBuffer();
+ StringBuffer datetime = new StringBuffer();
StringBuffer severity = new StringBuffer();
StringBuffer detail = new StringBuffer();
}
@@ -156,27 +153,20 @@
switch (state) {
case STATE_START:
if (character == '[')
- state = STATE_DATE;
+ state = STATE_DATETIME;
break;
- case STATE_DATE:
- if (character == ':')
- state = STATE_TIME;
- else
- data.date.append(character);
- break;
-
- case STATE_TIME:
+ case STATE_DATETIME:
if (character == ']')
state = STATE_SEVERITY;
else
- data.time.append(character);
+ data.datetime.append(character);
break;
case STATE_SEVERITY:
- if (character == ':')
+ if (character == ']')
state = STATE_DETAIL;
- else if (character != ' ')
+ else if (character != '[')
data.severity.append(character);
break;
@@ -207,10 +197,9 @@
model.setValueAt(
Integer.toString(rowOffset + rowIndex),
rowIndex, 0);
- model.setValueAt(d.date, rowIndex, 1);
- model.setValueAt(d.time, rowIndex, 2);
- model.setValueAt(d.severity, rowIndex, 3);
- model.setValueAt(d.detail, rowIndex, 4);
+ model.setValueAt(d.datetime, rowIndex, 1);
+ model.setValueAt(d.severity, rowIndex, 2);
+ model.setValueAt(d.detail, rowIndex, 3);
} else {
break;
}
More information about the Fedora-directory-commits
mailing list