From 1ab173bb3536182a1eb40f49e59c44bc030d649b Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 06 Oct 2015 08:08:53 +0000
Subject: [PATCH] bugfix: dsconfig on loggers trigger thread leaks
---
opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
index 2592f20..becba2e 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/loggers/TextErrorLogPublisher.java
@@ -352,9 +352,19 @@
if (config.isAsynchronous())
{
- if (!(writer instanceof AsynchronousTextWriter))
+ if (writer instanceof AsynchronousTextWriter)
{
- // The asynchronous setting is being turned on.
+ if (hasAsyncConfigChanged(config))
+ {
+ // reinstantiate
+ final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
+ writer = newAsyncWriter(mfWriter, config);
+ previousWriter.shutdown(false);
+ }
+ }
+ else
+ {
+ // turn async text writer on
writer = newAsyncWriter(mfWriter, config);
}
}
@@ -362,15 +372,14 @@
{
if (writer instanceof AsynchronousTextWriter)
{
- // The asynchronous setting is being turned off.
- AsynchronousTextWriter asyncWriter = (AsynchronousTextWriter) writer;
+ // asynchronous is being turned off, remove async text writers.
+ final AsynchronousTextWriter previousWriter = (AsynchronousTextWriter) writer;
writer = mfWriter;
- asyncWriter.shutdown(false);
+ previousWriter.shutdown(false);
}
}
- if (currentConfig.isAsynchronous()
- && config.isAsynchronous()
+ if (currentConfig.isAsynchronous() && config.isAsynchronous()
&& currentConfig.getQueueSize() != config.getQueueSize())
{
ccr.setAdminActionRequired(true);
@@ -421,6 +430,13 @@
return getFileForPath(config.getLogFile());
}
+ private boolean hasAsyncConfigChanged(FileBasedErrorLogPublisherCfg newConfig)
+ {
+ return !currentConfig.dn().equals(newConfig.dn())
+ && currentConfig.isAutoFlush() != newConfig.isAutoFlush()
+ && currentConfig.getQueueSize() != newConfig.getQueueSize();
+ }
+
private AsynchronousTextWriter newAsyncWriter(MultifileTextWriter mfWriter, FileBasedErrorLogPublisherCfg config)
{
String name = "Asynchronous Text Writer for " + config.dn();
--
Gitblit v1.10.0