You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2013/05/02 11:52:45 UTC
svn commit: r1478309 - /qpid/trunk/qpid/tools/src/py/qpid-config
Author: jross
Date: Thu May 2 09:52:44 2013
New Revision: 1478309
URL: http://svn.apache.org/r1478309
Log:
QPID-4805: Don't override qpidd.conf defined values for journal files; a patch from Ernie Allen
Modified:
qpid/trunk/qpid/tools/src/py/qpid-config
Modified: qpid/trunk/qpid/tools/src/py/qpid-config
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/tools/src/py/qpid-config?rev=1478309&r1=1478308&r2=1478309&view=diff
==============================================================================
--- qpid/trunk/qpid/tools/src/py/qpid-config (original)
+++ qpid/trunk/qpid/tools/src/py/qpid-config Thu May 2 09:52:44 2013
@@ -91,8 +91,8 @@ class Config:
self._clusterDurable = False
self._if_empty = True
self._if_unused = True
- self._fileCount = 8
- self._fileSize = 24
+ self._fileCount = None
+ self._fileSize = None
self._maxQueueSize = None
self._maxQueueCount = None
self._limitPolicy = None
@@ -194,8 +194,8 @@ def OptionsAndArguments(argv):
group3 = OptionGroup(parser, "Options for Adding Queues")
group3.add_option("--cluster-durable", action="store_true", help="The new queue becomes durable if there is only one functioning cluster node")
- group3.add_option("--file-count", action="store", type="int", default=8, metavar="<n>", help="Number of files in queue's persistence journal")
- group3.add_option("--file-size", action="store", type="int", default=24, metavar="<n>", help="File size in pages (64KiB/page)")
+ group3.add_option("--file-count", action="store", type="int", metavar="<n>", help="Number of files in queue's persistence journal")
+ group3.add_option("--file-size", action="store", type="int", metavar="<n>", help="File size in pages (64KiB/page)")
group3.add_option("--max-queue-size", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as bytes")
group3.add_option("--max-queue-count", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as a number of messages")
group3.add_option("--limit-policy", action="store", choices=["none", "reject", "flow-to-disk", "ring", "ring-strict"], metavar="<policy>", help="Action to take when queue limit is reached")
@@ -570,8 +570,12 @@ class BrokerManager:
declArgs[r[0]] = value
if config._durable:
- declArgs[FILECOUNT] = config._fileCount
- declArgs[FILESIZE] = config._fileSize
+ # allow the default fileCount and fileSize specified
+ # in qpid config file to take prededence
+ if config._fileCount:
+ declArgs[FILECOUNT] = config._fileCount
+ if config._fileSize:
+ declArgs[FILESIZE] = config._fileSize
if config._maxQueueSize is not None:
declArgs[MAX_QUEUE_SIZE] = config._maxQueueSize
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org