You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/06/17 15:37:34 UTC
svn commit: r1686011 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/logging/
main/java/org/apache/qpid/server/model/
main/java/org/apache/qpid/server/virtualhost/
test/java/org/apache/qpid/server/logging/
Author: orudyy
Date: Wed Jun 17 13:37:33 2015
New Revision: 1686011
URL: http://svn.apache.org/r1686011
Log:
QPID-6591: Change the default value for virtual host logger file location and address code review comments from Rob Godfrey
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AbstractLogger.java Wed Jun 17 13:37:33 2015
@@ -58,7 +58,7 @@ public abstract class AbstractLogger<X e
LoggerContext loggerContext = ROOT_LOGGER.getLoggerContext();
- Appender<ILoggingEvent> appender = asAppender(loggerContext);
+ Appender<ILoggingEvent> appender = createAppenderInstance(loggerContext);
appender.setName(getName());
appender.setContext(loggerContext);
@@ -79,7 +79,7 @@ public abstract class AbstractLogger<X e
}
}
- protected abstract Appender<ILoggingEvent> asAppender(Context context);
+ protected abstract Appender<ILoggingEvent> createAppenderInstance(Context context);
protected abstract Collection<? extends LoggerFilter> getLoggerFilters();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerConsoleLoggerImpl.java Wed Jun 17 13:37:33 2015
@@ -50,7 +50,7 @@ public class BrokerConsoleLoggerImpl ext
}
@Override
- public Appender<ILoggingEvent> asAppender(Context context)
+ protected Appender<ILoggingEvent> createAppenderInstance(Context context)
{
ConsoleAppender<ILoggingEvent> consoleAppender = new ConsoleAppender<>();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java Wed Jun 17 13:37:33 2015
@@ -96,7 +96,7 @@ public class BrokerFileLoggerImpl extend
}
@Override
- public Appender<ILoggingEvent> asAppender(Context loggerContext)
+ protected Appender<ILoggingEvent> createAppenderInstance(Context loggerContext)
{
return new RollingFileAppenderFactory().createRollingFileAppender(this, loggerContext);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerMemoryLoggerImpl.java Wed Jun 17 13:37:33 2015
@@ -49,7 +49,7 @@ public class BrokerMemoryLoggerImpl exte
}
@Override
- public Appender<ILoggingEvent> asAppender(Context context)
+ protected Appender<ILoggingEvent> createAppenderInstance(Context context)
{
return new RecordEventAppender(getMaxRecords());
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLogger.java Wed Jun 17 13:37:33 2015
@@ -31,8 +31,7 @@ public interface VirtualHostFileLogger<X
String TYPE = "File";
String FILE_NAME = "fileName";
- //TODO: change to better default
- @ManagedAttribute( defaultValue = "${qpid.work_dir}${file.separator}log${file.separator}${this:name}${file.separator}qpid.log")
+ @ManagedAttribute( defaultValue = "${virtualhost.work_dir}${file.separator}log${file.separator}${this:name}.log")
String getFileName();
@ManagedAttribute( defaultValue = "false")
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java Wed Jun 17 13:37:33 2015
@@ -104,7 +104,7 @@ public class VirtualHostFileLoggerImpl e
}
@Override
- public Appender<ILoggingEvent> asAppender(Context loggerContext)
+ protected Appender<ILoggingEvent> createAppenderInstance(Context loggerContext)
{
RollingFileAppender<ILoggingEvent> rollingFileAppender =
new RollingFileAppenderFactory().createRollingFileAppender(this, loggerContext);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Wed Jun 17 13:37:33 2015
@@ -53,6 +53,11 @@ public interface VirtualHost<X extends V
String ENABLED_CONNECTION_VALIDATORS = "enabledConnectionValidators";
String DISABLED_CONNECTION_VALIDATORS = "disabledConnectionValidators";
String GLOBAL_ADDRESS_DOMAINS = "globalAddressDomains";
+ String VIRTUALHOST_WORK_DIR_VAR = "virtualhost.work_dir";
+ String VIRTUALHOST_WORK_DIR_VAR_EXPRESSION = "${qpid.work_dir}${file.separator}${ancestor:virtualhost:name}";
+
+ @ManagedContextDefault( name = VIRTUALHOST_WORK_DIR_VAR)
+ public static final String VIRTUALHOST_WORK_DIR = VIRTUALHOST_WORK_DIR_VAR_EXPRESSION;
@ManagedContextDefault( name = "queue.deadLetterQueueEnabled")
public static final boolean DEFAULT_DEAD_LETTER_QUEUE_ENABLED = false;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostPrincipal.java Wed Jun 17 13:37:33 2015
@@ -21,20 +21,18 @@
package org.apache.qpid.server.virtualhost;
import java.security.Principal;
-import java.util.Objects;
import org.apache.qpid.server.model.VirtualHost;
public class VirtualHostPrincipal implements Principal
{
- private static String VIRTUALHOST_SUBJECT_TEMPLATE = "virtualhost:%s-%s";
private final VirtualHost<?,?,?> _virtualHost;
private final String _name;
public VirtualHostPrincipal(VirtualHost<?, ?, ?> virtualHost)
{
_virtualHost = virtualHost;
- _name = String.format(VIRTUALHOST_SUBJECT_TEMPLATE, virtualHost.getName(), virtualHost.getId());
+ _name = "virtualhost:" + virtualHost.getName() + "-" + virtualHost.getId();
}
@Override
@@ -56,12 +54,12 @@ public class VirtualHostPrincipal implem
}
VirtualHostPrincipal that = (VirtualHostPrincipal) o;
- return Objects.equals(_virtualHost, that._virtualHost);
+ return _virtualHost.equals(that._virtualHost);
}
@Override
public int hashCode()
{
- return Objects.hash(_virtualHost);
+ return _virtualHost.hashCode();
}
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java?rev=1686011&r1=1686010&r2=1686011&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/BrokerLoggerTest.java Wed Jun 17 13:37:33 2015
@@ -79,7 +79,7 @@ public class BrokerLoggerTest extends Qp
_brokerLogger = new AbstractBrokerLogger(attributes, broker)
{
@Override
- public Appender<ILoggingEvent> asAppender(Context context)
+ public Appender<ILoggingEvent> createAppenderInstance(Context context)
{
return _loggerAppender;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org