mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git
opends/src/server/org/opends/server/loggers/AsynchronousTextWriter.java
@@ -27,8 +27,6 @@ */ package org.opends.server.loggers; import java.util.ArrayList; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; @@ -39,8 +37,6 @@ import org.opends.server.api.ServerShutdownListener; import org.opends.server.core.DirectoryServer; /** * A Text Writer which writes log records asynchronously to * character-based stream. @@ -102,10 +98,12 @@ { super(name); } /** * the run method of the writerThread. Run until queue is empty * AND we've been asked to terminate */ @Override public void run() { ArrayList<String> drainList = new ArrayList<String>(capacity); @@ -156,10 +154,11 @@ } /** * Write the log record asyncronously. * Write the log record asynchronously. * * @param record the log record to write. */ @Override public void writeRecord(String record) { // No writer? Off to the bit bucket. @@ -184,6 +183,7 @@ /** * {@inheritDoc} */ @Override public void flush() { writer.flush(); @@ -192,6 +192,7 @@ /** * {@inheritDoc} */ @Override public long getBytesWritten() { return writer.getBytesWritten(); @@ -210,6 +211,7 @@ /** * {@inheritDoc} */ @Override public String getShutdownListenerName() { return "AsynchronousTextWriter Thread " + name; @@ -218,6 +220,7 @@ /** * {@inheritDoc} */ @Override public void processServerShutdown(Message reason) { // Don't shutdown the wrapped writer on server shutdown as it @@ -229,6 +232,7 @@ /** * {@inheritDoc} */ @Override public void shutdown() { shutdown(true); opends/src/server/org/opends/server/loggers/TextAccessLogPublisher.java
@@ -27,11 +27,6 @@ */ package org.opends.server.loggers; import static org.opends.messages.ConfigMessages.*; import static org.opends.server.util.StaticUtils.*; import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -48,32 +43,12 @@ import org.opends.server.api.ClientConnection; import org.opends.server.api.ExtendedOperationHandler; import org.opends.server.config.ConfigException; import org.opends.server.core.AbandonOperation; import org.opends.server.core.AddOperation; import org.opends.server.core.BindOperation; import org.opends.server.core.CompareOperation; import org.opends.server.core.DeleteOperation; import org.opends.server.core.DirectoryServer; import org.opends.server.core.ExtendedOperation; import org.opends.server.core.ModifyDNOperation; import org.opends.server.core.ModifyOperation; import org.opends.server.core.SearchOperation; import org.opends.server.core.UnbindOperation; import org.opends.server.types.AdditionalLogItem; import org.opends.server.types.AuthenticationInfo; import org.opends.server.types.ByteString; import org.opends.server.types.ConfigChangeResult; import org.opends.server.types.Control; import org.opends.server.types.DN; import org.opends.server.types.DirectoryException; import org.opends.server.types.DisconnectReason; import org.opends.server.types.FilePermission; import org.opends.server.types.InitializationException; import org.opends.server.types.Operation; import org.opends.server.types.ResultCode; import org.opends.server.core.*; import org.opends.server.types.*; import org.opends.server.util.TimeThread; import static org.opends.messages.ConfigMessages.*; import static org.opends.server.util.StaticUtils.*; /** * This class provides the implementation of the access logger used by the @@ -138,7 +113,7 @@ // Default result code. ResultCode resultCode = ResultCode.SUCCESS; boolean adminActionRequired = false; final ArrayList<Message> messages = new ArrayList<Message>(); final List<Message> messages = new ArrayList<Message>(); final File logFile = getFileForPath(config.getLogFile()); final FileNamingPolicy fnPolicy = new TimeStampNaming(logFile); @@ -214,7 +189,7 @@ { // The asynchronous setting is being turned on. writer = new AsynchronousTextWriter( "Asyncronous Text Writer for " + config.dn().toNormalizedString(), "Asynchronous Text Writer for " + config.dn().toNormalizedString(), config.getQueueSize(), config.isAutoFlush(), mfWriter); } @@ -299,7 +274,7 @@ if (cfg.getQueueSize() > 0) { this.writer = new AsynchronousTextWriter( "Asyncronous Text Writer for " + cfg.dn().toNormalizedString(), "Asynchronous Text Writer for " + cfg.dn().toNormalizedString(), cfg.getQueueSize(), cfg.isAutoFlush(), theWriter); } else @@ -711,7 +686,6 @@ buffer.append(clientConnection.getProtocol()); writer.writeRecord(buffer.toString()); }
@@ -26,10 +26,6 @@ * Portions copyright 2012-2013 ForgeRock AS. */ package org.opends.server.loggers; import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.LoggerMessages.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; import java.io.File; import java.io.IOException; @@ -47,6 +43,10 @@ import org.opends.server.types.*; import org.opends.server.util.TimeThread; import static org.opends.messages.ConfigMessages.*; import static org.opends.messages.LoggerMessages.*; import static org.opends.server.util.ServerConstants.*; import static org.opends.server.util.StaticUtils.*; /** * This class provides an implementation of an error log publisher. @@ -224,7 +224,6 @@ Message msg = WARN_ERROR_LOGGER_INVALID_OVERRIDE_SEVERITY.get(overrideSeverity); throw new ConfigException(msg); } else { String categoryName = overrideSeverity.substring(0, equalPos); @@ -233,8 +232,7 @@ { Category category = Category.valueOf(categoryName); HashSet<Severity> severities = new HashSet<Severity>(); Set<Severity> severities = new HashSet<Severity>(); StringTokenizer sevTokenizer = new StringTokenizer(overrideSeverity.substring(equalPos+1), ","); while (sevTokenizer.hasMoreElements()) @@ -255,9 +253,7 @@ { try { Severity severity = Severity.parseString(severityName); Severity severity = Severity.parseString(severityName); severities.add(severity); } catch(Exception e) @@ -387,7 +383,7 @@ // Default result code. ResultCode resultCode = ResultCode.SUCCESS; boolean adminActionRequired = false; ArrayList<Message> messages = new ArrayList<Message>(); List<Message> messages = new ArrayList<Message>(); Set<ErrorLogPublisherCfgDefn.DefaultSeverity> defSevs = config.getDefaultSeverity(); @@ -417,8 +413,7 @@ } else { Severity errorSeverity = Severity.parseString(defSev.name()); Severity errorSeverity = Severity.parseString(defSev.name()); if(errorSeverity != null) { defaultSeverities.add(errorSeverity); @@ -447,8 +442,7 @@ { Category category = Category.valueOf(categoryName); HashSet<Severity> severities = new HashSet<Severity>(); Set<Severity> severities = new HashSet<Severity>(); StringTokenizer sevTokenizer = new StringTokenizer(overrideSeverity.substring(equalPos+1), ","); while (sevTokenizer.hasMoreElements()) @@ -469,9 +463,7 @@ { try { Severity severity = Severity.parseString(severityName); Severity severity = Severity.parseString(severityName); severities.add(severity); } catch(Exception e) @@ -506,8 +498,8 @@ config.isAutoFlush() && !config.isAsynchronous(); TextWriter currentWriter; // Determine the writer we are using. If we were writing asyncronously, // we need to modify the underlaying writer. // Determine the writer we are using. If we were writing asynchronously, // we need to modify the underlying writer. if(writer instanceof AsynchronousTextWriter) { currentWriter = ((AsynchronousTextWriter)writer).getWrappedWriter(); @@ -559,8 +551,9 @@ mfWriter); } if((currentConfig.isAsynchronous() && config.isAsynchronous()) && (currentConfig.getQueueSize() != config.getQueueSize())) if (currentConfig.isAsynchronous() && config.isAsynchronous() && currentConfig.getQueueSize() != config.getQueueSize()) { adminActionRequired = true; } @@ -575,7 +568,6 @@ stackTraceToSingleLineString(e)); resultCode = DirectoryServer.getServerErrorResultCode(); messages.add(message); } return new ConfigChangeResult(resultCode, adminActionRequired, messages); @@ -615,7 +607,6 @@ if(severities.contains(severity)) { StringBuilder sb = new StringBuilder(); sb.append("["); sb.append(TimeThread.getLocalTime()); @@ -638,10 +629,7 @@ { return currentConfig.dn(); } else { return null; } return null; } }
@@ -27,17 +27,9 @@ */ package org.opends.server.loggers.debug; 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; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.*; import org.opends.messages.Message; import org.opends.server.admin.server.ConfigurationAddListener; @@ -58,6 +50,10 @@ import com.sleepycat.je.*; 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 @@ -282,7 +278,7 @@ // Default result code. ResultCode resultCode = ResultCode.SUCCESS; boolean adminActionRequired = false; ArrayList<Message> messages = new ArrayList<Message>(); List<Message> messages = new ArrayList<Message>(); //Get the default/global settings LogLevel logLevel = @@ -322,8 +318,8 @@ config.isAutoFlush() && !config.isAsynchronous(); TextWriter currentWriter; // Determine the writer we are using. If we were writing asyncronously, // we need to modify the underlaying writer. // Determine the writer we are using. If we were writing asynchronously, // we need to modify the underlying writer. if(writer instanceof AsynchronousTextWriter) { currentWriter = ((AsynchronousTextWriter)writer).getWrappedWriter(); @@ -428,7 +424,7 @@ // Default result code. ResultCode resultCode = ResultCode.SUCCESS; boolean adminActionRequired = false; ArrayList<Message> messages = new ArrayList<Message>(); List<Message> messages = new ArrayList<Message>(); addTraceSettings(config.getDebugScope(), new TraceSettings(config)); @@ -446,7 +442,7 @@ // Default result code. ResultCode resultCode = ResultCode.SUCCESS; boolean adminActionRequired = false; ArrayList<Message> messages = new ArrayList<Message>(); List<Message> messages = new ArrayList<Message>(); removeTraceSettings(config.getDebugScope()); @@ -882,9 +878,6 @@ { return currentConfig.dn(); } else { return null; } return null; } }
