Improve and clean authentication. Reintroduce anonymous login context.

[lgpl/argeo-commons.git] / org.argeo.cms / src / org / argeo / cms / internal / kernel / KernelThread.java

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelThread.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelThread.java
index e58cbeef1959654589c80b44699bceca27e13be5..944a7cd3dbcf3bd42b59afdc37ce535c49bff558 100644 (file)
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelThread.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/KernelThread.java
@@ -14,9 +14,7 @@ import org.argeo.cms.CmsException;
  * monitor/control other processes.
  */
 class KernelThread extends Thread {
-       @SuppressWarnings("unused")
-       private final Kernel kernel;
-       private final RepositoryStatisticsImpl repoStats;
+       private RepositoryStatisticsImpl repoStats;
 
        /** The smallest period of operation, in ms */
        private final long PERIOD = 60 * 1000l;
@@ -32,10 +30,8 @@ class KernelThread extends Thread {
        @SuppressWarnings("unused")
        private long cycle = 0l;
 
-       public KernelThread(Kernel kernel) {
-               super(kernel.threadGroup, kernel.getClass().getSimpleName());
-               this.kernel = kernel;
-               this.repoStats = kernel.node.getRepositoryStatistics();
+       public KernelThread(ThreadGroup threadGroup, String name) {
+               super(threadGroup, name);
        }
 
        private void doSmallestPeriod() {
@@ -45,19 +41,17 @@ class KernelThread extends Thread {
                        long freeMem = Runtime.getRuntime().freeMemory() / M;
                        long totalMem = Runtime.getRuntime().totalMemory() / M;
                        long maxMem = Runtime.getRuntime().maxMemory() / M;
-                       double loadAvg = ManagementFactory.getOperatingSystemMXBean()
-                                       .getSystemLoadAverage();
+                       double loadAvg = ManagementFactory.getOperatingSystemMXBean().getSystemLoadAverage();
                        // in min
                        boolean min = true;
-                       long uptime = ManagementFactory.getRuntimeMXBean().getUptime()
-                                       / (1000 * 60);
+                       long uptime = ManagementFactory.getRuntimeMXBean().getUptime() / (1000 * 60);
                        if (uptime > 24 * 60) {
                                min = false;
                                uptime = uptime / 60;
                        }
                        line.append(uptime).append(min ? " min" : " h").append('\t');
-                       line.append(loadAvg).append('\t').append(maxMem).append('\t')
-                                       .append(totalMem).append('\t').append(freeMem).append('\t');
+                       line.append(loadAvg).append('\t').append(maxMem).append('\t').append(totalMem).append('\t').append(freeMem)
+                                       .append('\t');
                        kernelStatsLog.debug(line);
                }
 
@@ -77,15 +71,14 @@ class KernelThread extends Thread {
                        // }
                        // long totalSpace = currentRoot.getTotalSpace();
                        StringBuilder line = new StringBuilder(128);
-                       line.append("§\t").append(freeSpace)
-                                       .append(" MB left in " + dataDir);
+                       line.append("§\t").append(freeSpace).append(" MB left in " + dataDir);
                        line.append('\n');
-                       for (RepositoryStatistics.Type type : RepositoryStatistics.Type
-                                       .values()) {
-                               long[] vals = repoStats.getTimeSeries(type).getValuePerMinute();
-                               long val = vals[vals.length - 1];
-                               line.append(type.name()).append('\t').append(val).append('\n');
-                       }
+                       if (repoStats != null)
+                               for (RepositoryStatistics.Type type : RepositoryStatistics.Type.values()) {
+                                       long[] vals = repoStats.getTimeSeries(type).getValuePerMinute();
+                                       long val = vals[vals.length - 1];
+                                       line.append(type.name()).append('\t').append(val).append('\n');
+                               }
                        nodeStatsLog.debug(line);
                }
        }