Improve logging

[lgpl/argeo-commons.git] / security / plugins / org.argeo.security.ui / src / main / java / org / argeo / security / ui / views / LogContentProvider.java

diff --git a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java
index 5e28228a11cf330d649597952d0634ea462e022f..08cca0d0a8195e67bf83ca715ac853cf2147b8c0 100644 (file)
--- a/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java
+++ b/security/plugins/org.argeo.security.ui/src/main/java/org/argeo/security/ui/views/LogContentProvider.java
@@ -3,34 +3,50 @@ package org.argeo.security.ui.views;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.LinkedList;
 import java.util.List;
 
 import org.argeo.ArgeoLogListener;
 import org.eclipse.jface.viewers.ILazyContentProvider;
 import org.eclipse.jface.viewers.TableViewer;
 import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.widgets.Table;
+import org.eclipse.swt.widgets.TableItem;
 
-/** A content provider maintaing an array of lines */
+/** A content provider maintaining an array of lines */
 class LogContentProvider implements ILazyContentProvider, ArgeoLogListener {
        private DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
 
+       private final Long start;
+       /** current - start = line number. first line is number '1' */
+       private Long current;
+
+       // TODO make it configurable
+       private final Integer maxLineBufferSize = 10 * 1000;
+
        private final TableViewer viewer;
-       private List<String> lines;
+       private final LinkedList<LogLine> lines;
 
        public LogContentProvider(TableViewer viewer) {
                this.viewer = viewer;
+               start = System.currentTimeMillis();
+               lines = new LinkedList<LogLine>();
+               current = start;
        }
 
        public synchronized void dispose() {
-               lines = null;
+               lines.clear();
        }
 
        @SuppressWarnings("unchecked")
        public synchronized void inputChanged(Viewer viewer, Object oldInput,
                        Object newInput) {
-               lines = (List<String>) newInput;
-               if (lines == null)
+               List<String> lin = (List<String>) newInput;
+               if (lin == null)
                        return;
+               for (String line : lin) {
+                       addLine(line);
+               }
                this.viewer.setItemCount(lines.size());
        }
 
@@ -50,32 +66,74 @@ class LogContentProvider implements ILazyContentProvider, ArgeoLogListener {
                buf.append(dateFormat.format(new Date(timestamp))).append(" ");
                buf.append(level).append(" ");
                int count = 0;
-               String lastLine = null;
                for (String line : message.split("\n")) {
-                       if (count == 0)
-                               lastLine = buf + line;
-                       else
-                               lastLine = line;
-                       lines.add(lastLine);
+                       addLine(count == 0 ? buf + line : line);
                        count++;
                }
 
                if (exception != null) {
                        for (String ste : exception) {
-                               lastLine = ste;
-                               lines.add(lastLine);
+                               addLine(ste);
                        }
                }
-               final Object lastElement = lastLine;
-               viewer.getTable().getDisplay().asyncExec(new Runnable() {
+               viewer.getTable().getDisplay().syncExec(new Runnable() {
                        public void run() {
                                viewer.setItemCount(lines.size());
-                               if (lastElement != null)
-                                       viewer.reveal(lastElement);
+                               // viewer.reveal(lines.peekLast());
+                               Table table = viewer.getTable();
+                               // table.setTopIndex(lines.size()-1);
+                               System.out.println("topIndex=" + table.getTopIndex()
+                                               + ", tableSize=" + lines.size());
+                               // table.select(lines.size() - 1);
+                               // table.showSelection();
+                               TableItem ti = table.getItem(lines.size() - 1);
+                               if (ti == null)
+                                       System.out.println("tableItem is null");
+                               table.showItem(ti);
                        }
                });
        }
-       // private class LogLine {
-       // private String message;
-       // }
+
+       protected synchronized LogLine addLine(String line) {
+               // check for maximal size and purge if necessary
+               while (lines.size() >= maxLineBufferSize) {
+                       for (int i = 0; i < maxLineBufferSize / 10; i++) {
+                               lines.poll();
+                       }
+               }
+
+               current++;
+               LogLine logLine = new LogLine(current, line);
+               lines.add(logLine);
+               return logLine;
+       }
+
+       private class LogLine {
+               private Long linenumber;
+               private String message;
+
+               public LogLine(Long linenumber, String message) {
+                       this.linenumber = linenumber;
+                       this.message = message;
+               }
+
+               @Override
+               public int hashCode() {
+                       return linenumber.intValue();
+               }
+
+               @Override
+               public boolean equals(Object obj) {
+                       if (obj instanceof LogLine)
+                               return ((LogLine) obj).linenumber.equals(linenumber);
+                       else
+                               return false;
+               }
+
+               @Override
+               public String toString() {
+                       return message;
+               }
+
+       }
 }
\ No newline at end of file