From c7d76a78a57f6408f7177967094f967973ebcae6 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Fri, 31 Jan 2014 15:10:48 +0000
Subject: [PATCH] TextDebugLogPublisher.java: Extracted getDefaultSettings() + fixed formatting.
---
opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
index 6617174..1b8f4d4 100644
--- a/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
+++ b/opendj3-server-dev/src/server/org/opends/server/loggers/TextDebugLogPublisher.java
@@ -26,10 +26,6 @@
*/
package org.opends.server.loggers;
-import static org.opends.messages.ConfigMessages.*;
-import static org.opends.server.util.ServerConstants.*;
-import static org.opends.server.util.StaticUtils.*;
-
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
@@ -56,6 +52,10 @@
import org.opends.server.types.ResultCode;
import org.opends.server.util.TimeThread;
+import static org.opends.messages.ConfigMessages.*;
+import static org.opends.server.util.ServerConstants.*;
+import static org.opends.server.util.StaticUtils.*;
+
/**
* The debug log publisher implementation that writes debug messages to files
* on disk. It also maintains the rotation and retention polices of the log
@@ -197,20 +197,11 @@
config.addDebugTargetAddListener(this);
config.addDebugTargetDeleteListener(this);
- TraceSettings defaultSettings =
- new TraceSettings(TraceSettings.Level.getLevel(true, config
- .isDefaultDebugExceptionsOnly()), config
- .isDefaultOmitMethodEntryArguments(), config
- .isDefaultOmitMethodReturnValue(), config
- .getDefaultThrowableStackFrames(), config
- .isDefaultIncludeThrowableCause());
-
- addTraceSettings(null, defaultSettings);
+ addTraceSettings(null, getDefaultSettings(config));
for(String name : config.listDebugTargets())
{
- DebugTargetCfg targetCfg = config.getDebugTarget(name);
-
+ final DebugTargetCfg targetCfg = config.getDebugTarget(name);
addTraceSettings(targetCfg.getDebugScope(), new TraceSettings(targetCfg));
}
@@ -264,16 +255,7 @@
boolean adminActionRequired = false;
List<LocalizableMessage> messages = new ArrayList<LocalizableMessage>();
- TraceSettings defaultSettings =
- new TraceSettings(TraceSettings.Level.getLevel(true, config
- .isDefaultDebugExceptionsOnly()), config
- .isDefaultOmitMethodEntryArguments(), config
- .isDefaultOmitMethodReturnValue(), config
- .getDefaultThrowableStackFrames(), config
- .isDefaultIncludeThrowableCause());
-
- addTraceSettings(null, defaultSettings);
-
+ addTraceSettings(null, getDefaultSettings(config));
DebugLogger.updateTracerSettings();
File logFile = getFileForPath(config.getLogFile());
@@ -361,6 +343,17 @@
return new ConfigChangeResult(resultCode, adminActionRequired, messages);
}
+ private TraceSettings getDefaultSettings(FileBasedDebugLogPublisherCfg config)
+ {
+ return new TraceSettings(TraceSettings.Level.getLevel(
+ true,
+ config.isDefaultDebugExceptionsOnly()),
+ config.isDefaultOmitMethodEntryArguments(),
+ config.isDefaultOmitMethodReturnValue(),
+ config.getDefaultThrowableStackFrames(),
+ config.isDefaultIncludeThrowableCause());
+ }
+
/**
* {@inheritDoc}
*/
--
Gitblit v1.10.0