diff options
author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-23 00:35:59 +0000 |
---|---|---|
committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-12-23 00:35:59 +0000 |
commit | 7e025be89224ffceb6944fbd4c2c92bcf6208d28 (patch) | |
tree | 0d345659dcb7f6e5f0cc30642c498da0c198a1ab | |
parent | 3a7b4a1cc4ce4e355c3cb1bb67b7ee209e09e7de (diff) | |
download | pki-7e025be89224ffceb6944fbd4c2c92bcf6208d28.tar.gz pki-7e025be89224ffceb6944fbd4c2c92bcf6208d28.tar.xz pki-7e025be89224ffceb6944fbd4c2c92bcf6208d28.zip |
Fix update for bugzilla bub #649343.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1665 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
4 files changed, 20 insertions, 3 deletions
diff --git a/pki/base/common/src/com/netscape/certsrv/common/Constants.java b/pki/base/common/src/com/netscape/certsrv/common/Constants.java index 6c6cef0ff..c85034918 100644 --- a/pki/base/common/src/com/netscape/certsrv/common/Constants.java +++ b/pki/base/common/src/com/netscape/certsrv/common/Constants.java @@ -248,6 +248,7 @@ public interface Constants { public final static String PR_PUBLISHING_QUEUE_THREADS = "queue.maxNumberOfThreads"; public final static String PR_PUBLISHING_QUEUE_PAGE_SIZE = "queue.pageSize"; public final static String PR_PUBLISHING_QUEUE_PRIORITY = "queue.priorityLevel"; + public final static String PR_PUBLISHING_QUEUE_STATUS = "queue.saveStatus"; public final static String PR_BASE_DN = "baseDN"; public final static String PR_DNCOMPS = "dnComps"; diff --git a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java index 956a30e26..a2704eed1 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/ARequestNotifier.java @@ -175,7 +175,7 @@ public class ARequestNotifier implements IRequestNotifier { private Object publishingCounterMonitor = new Object(); - private void updatePublishingStatus(String id) { + public void updatePublishingStatus(String id) { if (mRequestQueue != null) { synchronized (publishingCounterMonitor) { if (mSavePublishingCounter == 0) { @@ -265,7 +265,7 @@ public class ARequestNotifier implements IRequestNotifier { r = mRequestQueue.findRequest(new RequestId(id)); mRequests.remove(0); CMS.debug("getRequest request "+ id + ((r != null)?" found":" not found")); - updatePublishingStatus(id); + //updatePublishingStatus(id); } catch (EBaseException e) { CMS.debug("getRequest EBaseException " + e.toString()); } @@ -518,12 +518,15 @@ class RunListeners implements Runnable { do { if (mRequestNotifier != null) mRequest = (IRequest)mRequestNotifier.getRequest(); if (mListeners != null && mRequest != null) { - CMS.debug("RunListeners: mRequest = " + mRequest.getRequestId().toString()); while (mListeners.hasMoreElements()) { IRequestListener l = (IRequestListener) mListeners.nextElement(); CMS.debug("RunListeners: IRequestListener = " + l.getClass().getName()); l.accept(mRequest); } + if (mRequestNotifier != null) { + CMS.debug("RunListeners: mRequest = " + mRequest.getRequestId().toString()); + mRequestNotifier.updatePublishingStatus(mRequest.getRequestId().toString()); + } } CMS.debug("RunListeners: "+((mRequestNotifier != null && mRequestNotifier.getNumberOfRequests() > 0)?" Queue: "+mRequestNotifier.getNumberOfRequests():" noQueue")+ " "+((mRequest != null)?" SingleRequest":" noSingleRequest")); diff --git a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java index 91cb7544a..7cf31557f 100644 --- a/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java +++ b/pki/base/common/src/com/netscape/certsrv/request/IRequestNotifier.java @@ -129,4 +129,5 @@ public interface IRequestNotifier extends INotify { int publishingQueuePageSize, int savePublishingStatus); + public void updatePublishingStatus(String id); } diff --git a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java index 4e0132e36..d7639fdb2 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java +++ b/pki/base/common/src/com/netscape/cms/servlet/admin/PublisherAdminServlet.java @@ -431,6 +431,8 @@ public class PublisherAdminServlet extends AdminServlet { continue; if (name.equals(Constants.PR_PUBLISHING_QUEUE_PRIORITY)) continue; + if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS)) + continue; if (name.equals(Constants.PR_CERT_NAMES)) { ICryptoSubsystem jss = (ICryptoSubsystem) CMS.getSubsystem(CMS.SUBSYSTEM_CRYPTO); @@ -460,6 +462,8 @@ public class PublisherAdminServlet extends AdminServlet { publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_PAGE_SIZE, "40")); params.add(Constants.PR_PUBLISHING_QUEUE_PRIORITY, publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_PRIORITY, "0")); + params.add(Constants.PR_PUBLISHING_QUEUE_STATUS, + publishcfg.getString(Constants.PR_PUBLISHING_QUEUE_STATUS, "200")); params.add(Constants.PR_ENABLE, ldapcfg.getString(IPublisherProcessor.PROP_ENABLE, Constants.FALSE)); sendResponse(SUCCESS, null, params, resp); @@ -525,6 +529,10 @@ public class PublisherAdminServlet extends AdminServlet { publishcfg.putString(name, req.getParameter(name)); continue; } + if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS)) { + publishcfg.putString(name, req.getParameter(name)); + continue; + } /* Don't enter the publishing pw into the config store */ ldap.putString(name, req.getParameter(name)); @@ -641,6 +649,10 @@ public class PublisherAdminServlet extends AdminServlet { publishcfg.putString(name, req.getParameter(name)); continue; } + if (name.equals(Constants.PR_PUBLISHING_QUEUE_STATUS)) { + publishcfg.putString(name, req.getParameter(name)); + continue; + } /* Don't enter the publishing pw into the config store */ ldap.putString(name, req.getParameter(name)); |