Fix log filtering initialization

dCache support per cell log levels through a custom turbo filter. This
turbo filter is initialized during cell initialization, however the current
initialization point is at the end of the cell creation. The consequence is
that messages logged before this point are not under the control of the
filter.

This patch moves the initialization point inside CellNucleus instead.

Target: trunk
Require-notes: no
Require-book: no
Acked-by: Paul Millar <paul.millar@desy.de>
Patch: http://rb.dcache.org/r/5245/

Author: Gerd Behrmann

modules/cells/src/main/java/dmg/cells/nucleus/CellAdapter.java

@@ -164,18 +164,7 @@ public CellAdapter(String  cellName,
             setCommandExceptionEnabled(false);
         }
 
-        /* Instantiate management component for log filtering.
-         */
-        CellNucleus parentNucleus =
-            CellNucleus.getLogTargetForCell(MDC.get(CDC.MDC_CELL));
-        FilterThresholds parentThresholds =
-            (parentNucleus.isSystemNucleus() || parentNucleus == _nucleus)
-            ? RootFilterThresholds.getInstance()
-            : parentNucleus.getLoggingThresholds();
-
-        FilterThresholds thresholds = new FilterThresholds(parentThresholds);
-        _nucleus.setLoggingThresholds(thresholds);
-        addCommandListener(new FilterShell(thresholds));
+        addCommandListener(new FilterShell(_nucleus.getLoggingThresholds()));
 
         if (startNow) {
             start();

modules/cells/src/main/java/dmg/cells/nucleus/CellNucleus.java

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.slf4j.MDC;
 
 import java.io.FileNotFoundException;
 import java.io.Reader;
@@ -28,6 +29,7 @@
 import dmg.util.Slf4jErrorWriter;
 import dmg.util.Slf4jInfoWriter;
 import dmg.util.logback.FilterThresholds;
+import dmg.util.logback.RootFilterThresholds;
 
 /**
  *
@@ -130,6 +132,16 @@ public CellNucleus(Cell cell, String name, String type)
         _cell = cell;
         _cellClass = _cell.getClass().getName();
 
+        /* Instantiate management component for log filtering.
+         */
+        CellNucleus parentNucleus =
+                CellNucleus.getLogTargetForCell(MDC.get(CDC.MDC_CELL));
+        FilterThresholds parentThresholds =
+                (parentNucleus.isSystemNucleus() || parentNucleus == this)
+                        ? RootFilterThresholds.getInstance()
+                        : parentNucleus.getLoggingThresholds();
+        setLoggingThresholds(new FilterThresholds(parentThresholds));
+
         //
         // for the use in restricted sandboxes
         //
@@ -153,7 +165,7 @@ public CellNucleus(Cell cell, String name, String type)
         _printoutLevel = __cellGlue.getDefaultPrintoutLevel();
         __cellGlue.addCell(_cellName, this);
 
-        _logNucleus.info("Created : "+name);
+        _logNucleus.info("Created : " + name);
     }
 
     /**
@@ -649,7 +661,8 @@ private void killThreads(Collection<Thread> threads)
     {
         for (Thread thread: threads) {
             if (thread.isAlive()) {
-                _logNucleus.info("killerThread : interrupting " + thread.getName());
+                _logNucleus.info("killerThread : interrupting " + thread
+                        .getName());
                 thread.interrupt();
             }
         }
@@ -745,7 +758,7 @@ void addToEventQueue(MessageEvent ce) {
             //
             final CellMessage msg = ce.getMessage();
             if (msg != null) {
-                _logNucleus.info("addToEventQueue : message arrived : "+msg);
+                _logNucleus.info("addToEventQueue : message arrived : " + msg);
                 CellLock lock;
 
                 synchronized (_waitHash) {
@@ -756,16 +769,16 @@ void addToEventQueue(MessageEvent ce) {
                     //
                     // we were waiting for you (sync or async)
                     //
-                    _logNucleus.info("addToEventQueue : lock found for : "+msg);
+                    _logNucleus.info("addToEventQueue : lock found for : " + msg);
                     if (lock.isSync()) {
-                        _logNucleus.info("addToEventQueue : is synchronous : "+msg);
+                        _logNucleus.info("addToEventQueue : is synchronous : " + msg);
                         synchronized (lock) {
                             lock.setObject(msg);
                             lock.notifyAll();
                         }
-                        _logNucleus.info("addToEventQueue : dest. was triggered : "+msg);
+                        _logNucleus.info("addToEventQueue : dest. was triggered : " + msg);
                     } else {
-                        _logNucleus.info("addToEventQueue : is asynchronous : "+msg);
+                        _logNucleus.info("addToEventQueue : is asynchronous : " + msg);
                         try {
                             _callbackExecutor.execute(new CallbackTask(lock, msg));
                         } catch (RejectedExecutionException e) {
@@ -794,7 +807,7 @@ void sendKillEvent(KillEvent ce)
         Thread thread = new Thread(__cellGlue.getKillerThreadGroup(), wrapLoggingContext(new KillerTask(ce)), "killer-" + _cellName);
         thread.start();
         _logNucleus.info("sendKillEvent : {} started on group {}",
-                         thread.getName(), thread.getThreadGroup().getName());
+                thread.getName(), thread.getThreadGroup().getName());
     }
 
     //
@@ -962,7 +975,7 @@ public void run()
             shutdownPrivateExecutors();
 
             _logNucleus.info("killerThread : waiting for all threads in {} to finish",
-                             _threads);
+                    _threads);
 
             try {
                 Collection<Thread> threads = getNonDaemonThreads(_threads);
@@ -1089,15 +1102,18 @@ public void innerRun()
                     //
                     if (_logMessages.isDebugEnabled()) {
                         String messageObject = msg.getMessageObject() == null? "NULL" : msg.getMessageObject().getClass().getName();
-                        _logMessages.debug("nucleusMessageArrived src=" + msg.getSourcePath() +
-                                           " dest=" + msg.getDestinationPath() + " [" + messageObject + "] UOID=" + msg.getUOID().toString());
+                        _logMessages.debug("nucleusMessageArrived src=" + msg
+                                .getSourcePath() +
+                                " dest=" + msg
+                                .getDestinationPath() + " [" + messageObject + "] UOID=" + msg
+                                .getUOID().toString());
                     }
                     //
                     // and deliver it
                     //
-                    _logNucleus.info("messageThread : delivering message : "+msg);
+                    _logNucleus.info("messageThread : delivering message : " + msg);
                     _cell.messageArrived(new MessageEvent(msg));
-                    _logNucleus.info("messageThread : delivering message done : "+msg);
+                    _logNucleus.info("messageThread : delivering message done : " + msg);
                 } catch (RuntimeException e) {
                     if (!msg.isReply()) {
                         try {