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 2020/08/22 23:50:42 UTC
[qpid-broker-j] 05/05: QPID-8368: [Broker-J] Move graylog loggers
into graylog package
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 03243548847eaae1603bc5f809eb8d4a03079329
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Sun Aug 23 00:33:00 2020 +0100
QPID-8368: [Broker-J] Move graylog loggers into graylog package
This closes #52
---
.../server/logging/logback/{ => graylog}/BrokerGraylogLogger.java | 2 +-
.../logging/logback/{ => graylog}/BrokerGraylogLoggerImpl.java | 5 +++--
.../logging/logback/{ => graylog}/GelfAppenderConfiguration.java | 2 +-
.../server/logging/logback/{ => graylog}/GelfAppenderDefaults.java | 2 +-
.../apache/qpid/server/logging/logback/{ => graylog}/GelfCheck.java | 2 +-
.../logging/logback/{ => graylog}/GelfEncoderConfiguration.java | 2 +-
.../server/logging/logback/{ => graylog}/GelfEncoderDefaults.java | 2 +-
.../qpid/server/logging/logback/{ => graylog}/GraylogAppender.java | 2 +-
.../qpid/server/logging/logback/{ => graylog}/GraylogLogger.java | 2 +-
.../logging/logback/{ => graylog}/VirtualHostGraylogLogger.java | 2 +-
.../logging/logback/{ => graylog}/VirtualHostGraylogLoggerImpl.java | 5 +++--
.../server/logging/logback/validator/GelfConfigurationValidator.java | 2 +-
.../server/logging/logback/{ => graylog}/GraylogAppenderTest.java | 2 +-
.../logging/logback/validator/GelfConfigurationValidatorTest.java | 2 +-
14 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLogger.java
similarity index 94%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLogger.java
index 0a24c32..291844e 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLogger.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLogger.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import org.apache.qpid.server.model.BrokerLogger;
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLoggerImpl.java
similarity index 97%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLoggerImpl.java
index e75a6fd..cc22cad 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerGraylogLoggerImpl.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/BrokerGraylogLoggerImpl.java
@@ -18,13 +18,14 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import ch.qos.logback.classic.AsyncAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
+import org.apache.qpid.server.logging.logback.AbstractBrokerLogger;
import org.apache.qpid.server.logging.logback.validator.GelfConfigurationValidator;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttributeField;
@@ -42,7 +43,7 @@ public class BrokerGraylogLoggerImpl extends AbstractBrokerLogger<BrokerGraylogL
implements BrokerGraylogLogger<BrokerGraylogLoggerImpl>
{
@ManagedObjectFactoryConstructor(conditionallyAvailable = true,
- condition = "org.apache.qpid.server.logging.logback.GelfCheck#isAvailable()")
+ condition = "org.apache.qpid.server.logging.logback.graylog.GelfCheck#isAvailable()")
public BrokerGraylogLoggerImpl(Map<String, Object> attributes, Broker<?> broker)
{
super(attributes, broker);
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderConfiguration.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderConfiguration.java
similarity index 96%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderConfiguration.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderConfiguration.java
index 7d2fc24..491e82d 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderConfiguration.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderConfiguration.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
public interface GelfAppenderConfiguration extends GelfEncoderConfiguration
{
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderDefaults.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderDefaults.java
similarity index 97%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderDefaults.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderDefaults.java
index 6749af9..750d1e8 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfAppenderDefaults.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfAppenderDefaults.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
public enum GelfAppenderDefaults
{
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfCheck.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfCheck.java
similarity index 95%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfCheck.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfCheck.java
index 3b21892..7c47b41 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfCheck.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfCheck.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
public class GelfCheck
{
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderConfiguration.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderConfiguration.java
similarity index 96%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderConfiguration.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderConfiguration.java
index 500c571..d3f5c16 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderConfiguration.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderConfiguration.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import java.util.Collections;
import java.util.Map;
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderDefaults.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderDefaults.java
similarity index 97%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderDefaults.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderDefaults.java
index 62890ec..661ed2a 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GelfEncoderDefaults.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GelfEncoderDefaults.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
public enum GelfEncoderDefaults
{
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogAppender.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java
similarity index 98%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogAppender.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java
index 841bb8b..ac9e89b 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogAppender.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppender.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import ch.qos.logback.classic.AsyncAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogLogger.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogLogger.java
similarity index 98%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogLogger.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogLogger.java
index f47230e..2282376 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/GraylogLogger.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/GraylogLogger.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import ch.qos.logback.classic.AsyncAppender;
import org.apache.qpid.server.model.ConfiguredObject;
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLogger.java
similarity index 94%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLogger.java
index 47c2143..67094e6 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLogger.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLogger.java
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import org.apache.qpid.server.model.VirtualHostLogger;
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLoggerImpl.java
similarity index 97%
rename from broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java
rename to broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLoggerImpl.java
index 0a4f38c..b4965f5 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/VirtualHostGraylogLoggerImpl.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/graylog/VirtualHostGraylogLoggerImpl.java
@@ -18,13 +18,14 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import ch.qos.logback.classic.AsyncAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
+import org.apache.qpid.server.logging.logback.AbstractVirtualHostLogger;
import org.apache.qpid.server.logging.logback.validator.GelfConfigurationValidator;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObject;
@@ -93,7 +94,7 @@ public class VirtualHostGraylogLoggerImpl extends AbstractVirtualHostLogger<Virt
private AsyncAppender _appender;
@ManagedObjectFactoryConstructor(conditionallyAvailable = true,
- condition = "org.apache.qpid.server.logging.logback.GelfCheck#isAvailable()")
+ condition = "org.apache.qpid.server.logging.logback.graylog.GelfCheck#isAvailable()")
public VirtualHostGraylogLoggerImpl(Map<String, Object> attributes, VirtualHost<?> virtualHost)
{
super(attributes, virtualHost);
diff --git a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidator.java b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidator.java
index 2eb0d37..0556df6 100644
--- a/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidator.java
+++ b/broker-plugins/graylog-logging-logback/src/main/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidator.java
@@ -21,7 +21,7 @@
package org.apache.qpid.server.logging.logback.validator;
-import org.apache.qpid.server.logging.logback.GelfAppenderConfiguration;
+import org.apache.qpid.server.logging.logback.graylog.GelfAppenderConfiguration;
import org.apache.qpid.server.model.ConfiguredObject;
import java.util.Arrays;
diff --git a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/GraylogAppenderTest.java b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppenderTest.java
similarity index 99%
rename from broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/GraylogAppenderTest.java
rename to broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppenderTest.java
index 97b6e46..b3e1bd7 100644
--- a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/GraylogAppenderTest.java
+++ b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/graylog/GraylogAppenderTest.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.qpid.server.logging.logback;
+package org.apache.qpid.server.logging.logback.graylog;
import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
diff --git a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidatorTest.java b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidatorTest.java
index 4d62581..be1b37c 100644
--- a/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidatorTest.java
+++ b/broker-plugins/graylog-logging-logback/src/test/java/org/apache/qpid/server/logging/logback/validator/GelfConfigurationValidatorTest.java
@@ -1,7 +1,7 @@
package org.apache.qpid.server.logging.logback.validator;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.logback.GelfAppenderConfiguration;
+import org.apache.qpid.server.logging.logback.graylog.GelfAppenderConfiguration;
import org.apache.qpid.test.utils.UnitTestBase;
import org.junit.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org