You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/02/25 18:15:19 UTC
svn commit: r1732333 - in
/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security:
FileKeyStoreImpl.java NonJavaKeyStoreImpl.java
Author: rgodfrey
Date: Thu Feb 25 17:15:19 2016
New Revision: 1732333
URL: http://svn.apache.org/viewvc?rev=1732333&view=rev
Log:
QPID-6995 : Keystores should log when then contain certificates which will soon be expiring
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java?rev=1732333&r1=1732332&r2=1732333&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/FileKeyStoreImpl.java Thu Feb 25 17:15:19 2016
@@ -110,31 +110,6 @@ public class FileKeyStoreImpl extends Ab
_eventLogger.message(KeyStoreMessages.CREATE(getName()));
}
-
- @StateTransition(currentState = { State.STOPPED, State.ERRORED, State.UNINITIALIZED }, desiredState = State.ACTIVE)
- protected ListenableFuture<Void> onActivate()
- {
- int checkFrequency;
- try
- {
- checkFrequency = getContextValue(Integer.class, CERTIFICATE_EXPIRY_CHECK_FREQUENCY);
- }
- catch (IllegalArgumentException | NullPointerException e)
- {
- LOGGER.warn("Cannot parse the context variable {} ", CERTIFICATE_EXPIRY_CHECK_FREQUENCY, e);
- checkFrequency = DEFAULT_CERTIFICATE_EXPIRY_CHECK_FREQUENCY;
- }
- _checkExpiryTaskFuture = _broker.scheduleHouseKeepingTask(checkFrequency, TimeUnit.DAYS, new Runnable()
- {
- @Override
- public void run()
- {
- checkCertificateExpiry();
- }
- });
- return Futures.immediateFuture(null);
- }
-
@Override
protected void onClose()
{
@@ -176,6 +151,24 @@ public class FileKeyStoreImpl extends Ab
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
+ int checkFrequency;
+ try
+ {
+ checkFrequency = getContextValue(Integer.class, CERTIFICATE_EXPIRY_CHECK_FREQUENCY);
+ }
+ catch (IllegalArgumentException | NullPointerException e)
+ {
+ LOGGER.warn("Cannot parse the context variable {} ", CERTIFICATE_EXPIRY_CHECK_FREQUENCY, e);
+ checkFrequency = DEFAULT_CERTIFICATE_EXPIRY_CHECK_FREQUENCY;
+ }
+ _checkExpiryTaskFuture = _broker.scheduleHouseKeepingTask(checkFrequency, TimeUnit.DAYS, new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ checkCertificateExpiry();
+ }
+ });
setState(State.ACTIVE);
return Futures.immediateFuture(null);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java?rev=1732333&r1=1732332&r2=1732333&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/NonJavaKeyStoreImpl.java Thu Feb 25 17:15:19 2016
@@ -108,31 +108,6 @@ public class NonJavaKeyStoreImpl extends
_eventLogger.message(KeyStoreMessages.CREATE(getName()));
}
-
- @StateTransition(currentState = { State.STOPPED, State.ERRORED, State.UNINITIALIZED }, desiredState = State.ACTIVE)
- protected ListenableFuture<Void> onActivate()
- {
- int checkFrequency;
- try
- {
- checkFrequency = getContextValue(Integer.class, CERTIFICATE_EXPIRY_CHECK_FREQUENCY);
- }
- catch (IllegalArgumentException | NullPointerException e)
- {
- LOGGER.warn("Cannot parse the context variable {} ", CERTIFICATE_EXPIRY_CHECK_FREQUENCY, e);
- checkFrequency = DEFAULT_CERTIFICATE_EXPIRY_CHECK_FREQUENCY;
- }
- _checkExpiryTaskFuture = _broker.scheduleHouseKeepingTask(checkFrequency, TimeUnit.DAYS, new Runnable()
- {
- @Override
- public void run()
- {
- checkCertificateExpiry();
- }
- });
- return Futures.immediateFuture(null);
- }
-
@Override
protected void onClose()
{
@@ -247,6 +222,25 @@ public class NonJavaKeyStoreImpl extends
@StateTransition(currentState = {State.UNINITIALIZED, State.ERRORED}, desiredState = State.ACTIVE)
protected ListenableFuture<Void> doActivate()
{
+ int checkFrequency;
+ try
+ {
+ checkFrequency = getContextValue(Integer.class, CERTIFICATE_EXPIRY_CHECK_FREQUENCY);
+ }
+ catch (IllegalArgumentException | NullPointerException e)
+ {
+ LOGGER.warn("Cannot parse the context variable {} ", CERTIFICATE_EXPIRY_CHECK_FREQUENCY, e);
+ checkFrequency = DEFAULT_CERTIFICATE_EXPIRY_CHECK_FREQUENCY;
+ }
+ _checkExpiryTaskFuture = _broker.scheduleHouseKeepingTask(checkFrequency, TimeUnit.DAYS, new Runnable()
+ {
+ @Override
+ public void run()
+ {
+ checkCertificateExpiry();
+ }
+ });
+
setState(State.ACTIVE);
return Futures.immediateFuture(null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org