summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge "Provide i18n to those messages without _()"Jenkins2012-11-294-6/+10
|\ \ \
| * | | Provide i18n to those messages without _()Davanum Srinivas2012-11-284-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1081498 There are a few log messages without _(), but a lot messages with _(). Wrap these log messages with _() in order to make the code consistent. fix missing imports for _ Pass the log message and interpolation argument(s) to the logger separately remove extra parens rework the patch against latest trunk Change-Id: Ib0a7b0f9c57aadfbc2cfc477c6123b885c9c6060
* | | | Merge "Use Service thread group for WSGI request handling"Jenkins2012-11-293-14/+30
|\ \ \ \
| * | | | Use Service thread group for WSGI request handlingDavanum Srinivas2012-11-293-14/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Reuse the pool from thread group in service.Service instead of creating a new green pool - Add ability to control the size of the pool in service.Service - Add a couple of tests for wsgi.Service() to test the size of pool a start/stop as well - Get rid of the wait method by using tg.add_thread - Get rid of pool in wsgi.Service - Added explicit property for host and port Fixes LP #1050379 Change-Id: I40507dc7887fb036ec594bb167cdaa42c278607e
* | | | | Merge "Qpid H/A cluster support"Jenkins2012-11-291-9/+14
|\ \ \ \ \
| * | | | | Qpid H/A cluster supportEugene Kirpichov2012-11-291-9/+14
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Implements blueprint qpid-roundrobin-reconnect Change-Id: I01b65e6c33a238663667e9b6023b90172f1b77dd
* | | | | Merge "Hide the GroupAttr conf and group attributes"Jenkins2012-11-292-6/+18
|\ \ \ \ \
| * | | | | Hide the GroupAttr conf and group attributesMark McLoughlin2012-11-232-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no reason why an option group shouldn't have options called 'group' or 'conf'. Add a test case which would have failed because the 'conf' attribute would have been a ConfigOpts instance and fix it by making those attributes private. Change-Id: Ic3e41a546c0d1b7b6aae04e1dbac2933ac661f57
* | | | | | Merge "Fix regression with cfg CLI arguments"Jenkins2012-11-292-10/+16
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Fix regression with cfg CLI argumentsMark McLoughlin2012-11-262-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1082279 Only options registered using register_cli_opt() should be available via the CLI, but since e42276a all options are added to the CLI. Also modify one of the existing unit tests to catch this problem. Change-Id: I742a4ae4e0fc17cd9ae5e4424c2edd38e2bc50a2
* | | | | Merge "Fixes import order"Jenkins2012-11-291-1/+1
|\ \ \ \ \
| * | | | | Fixes import orderZhongyue Luo2012-11-281-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Rearranged import order of openstack.common.rpc.matchmaker Change-Id: I034a96e459763910adf51dc8f6642d6485208732
* | | | | Merge "Add another duplicate opt test case"Jenkins2012-11-291-0/+5
|\ \ \ \ \
| * | | | | Add another duplicate opt test caseMark McLoughlin2012-11-231-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | This gets the code coverage of the tests back up to 100%. Change-Id: I737c1cfa52d10b3813237a9cb88b15211e0872c1
* | | | | Merge "Fix broken --help with CommonConfigOpts"Jenkins2012-11-292-3/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Fix broken --help with CommonConfigOptsMark McLoughlin2012-11-232-3/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since we switched to argparse, the way help strings are interpolated have changed and broken --help with the options registered by CommonConfigOpts. Fix and add a new test case which would catch the issue. Change-Id: I10e42efe4721e22ff41d0efbf390c805ccb9a6a0
* | | | Make project pyflakes clean.Monty Taylor2012-11-2816-30/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added both a tox test-env for pyflakes and fixed the current pyflakes errors. This did actually fix a couple of bugs. The CI team has started using pyflakes on its projects and also has started using oslo for things, so ignoring pyflakes warnings on the oslo code was starting to get old. However, additionally, pyflakes is pretty solid, so we should maybe consider gating on it across the board. (% locals() is the biggest thing that we do that it doesn't like) Change-Id: Iac1ca62db301892b7863711162fcbc74807eb24f
* | | | Replace try: import with extras.try_importMonty Taylor2012-11-282-5/+3
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The block form: try: import foo except: foo = None is confusing to code analysis tools looking for redefinition. It's also a common enough pattern that someone else has encoded it into a library. Let's use that instead. Change-Id: I35a5c7a7e3595a51ba1ef1886c3965f463dba04a
* | | Merge "Fixup update.py after argparse breakage"Jenkins2012-11-271-15/+12
|\ \ \
| * | | Fixup update.py after argparse breakageKiall Mac Innes2012-11-231-15/+12
| |/ / | | | | | | | | | | | | | | | | | | Commit 5b9cb4148 changed the way cfg support's positional arguments and broke update.py. Use the new positional argument infrastructure. Change-Id: I0dc8b5ec445daaf3b437eb524c6eb4b684e5a695
* | / Fix common rpc to use common logging instead of python loggingDavanum Srinivas2012-11-244-4/+4
| |/ |/| | | | | | | | | | | | | Looks like we just need to fix imports Fixes Bug #1072633 Change-Id: Iac84ae3aadbe440f9b19e184f080320e4c6cca5f
* | Fix ListOpt to trim whitespaceDavanum Srinivas2012-11-242-1/+5
| | | | | | | | | | | | | | | | | | - throw in an extra strip() in the list parsing code - add a test case to verify that it works! Fixes LP #1079299 Change-Id: I4f0864c72ecd2569d0461c301acda395c87a93e0
* | Merge "Remove sitepackages=True from tox.ini"Jenkins2012-11-241-2/+0
|\ \
| * | Remove sitepackages=True from tox.iniMark McLoughlin2012-11-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1082002 With sitepackages=True, I'm seeing the tests fail on my machine because the older system version of nose gets used. Looking at other projects, this is only set in the tox:jenkins section where one exists. Change-Id: I1ab5f337adf8fc668608146ccb2ab3f2590204be
* | | Merge "raise_on_error parameter shouldn't be passed to task function"Jenkins2012-11-242-17/+11
|\ \ \ | |_|/ |/| |
| * | raise_on_error parameter shouldn't be passed to task functiongongysh2012-11-232-17/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the run_periodic_tasks() so that It has known parameters. Task function has the only parameter 'context' Bug #1081428 Change-Id: Ibc3da521df3dc47f8c136ade1070112fd5ea1039
* | | Merge "Account for tasks duration in LoopingCall delay"Jenkins2012-11-233-12/+61
|\ \ \
| * | | Account for tasks duration in LoopingCall delayEoghan Glynn2012-11-193-12/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1079725 Previously the time spent executing tasks was not accounted for when determining how much time to sleep between task runs. Now we subtract the duration of the last tasks run from the next sleep interval. Change-Id: I4b3e27d4aaa21d020159d46eea40bdd80361cea7
* | | | Merge "Convenience wrapper for datetime.timedelta.total_seconds()"Jenkins2012-11-232-0/+20
|\| | | | |/ / |/| |
| * | Convenience wrapper for datetime.timedelta.total_seconds()Eoghan Glynn2012-11-192-0/+20
| | | | | | | | | | | | | | | | | | | | | Allows time deltas in seconds to be concisely calculated for py26 and py27. Change-Id: I8987af1f892fda0a72f5eb0d45f94c595792dc78
* | | Merge "update deprecated stanza"Jenkins2012-11-222-4/+4
|\ \ \ | |_|/ |/| |
| * | update deprecated stanzaSean Dague2012-11-152-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | the deprecated stanza from nova had hard coded "Deprecated Config", but is now be used in not config scenarios. Update it to just "Deprecated". Change-Id: Icf86447aea6cd509e4e67fe0be7e9157006410a4
* | | Merge "updating sphinx documentation"Jenkins2012-11-2020-51/+1301
|\ \ \
| * | | updating sphinx documentationJoe Heck2012-11-1820-51/+1301
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * adding openstack theming (copied from keystone project theme) * updating .gitignore to ignore generated API docs * updated formatting in index.rst page * updaed openstack/common/processutils.py to match hacking docstring * updated docstrings to resolve sphinx warnings Change-Id: Ie89afe20eeab1efd2daf440fc65ccdf90f723c51
* | | | Merge "Fix update.py string interpolation"Jenkins2012-11-191-1/+1
|\ \ \ \
| * | | | Fix update.py string interpolationKiall Mac Innes2012-11-181-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: I4b0d31089cbc329ae4bc4af94edd6ac647f49fa1
* | | | Merge "Use the ThreadGroup for the Launcher"Jenkins2012-11-191-11/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Use the ThreadGroup for the LauncherAngus Salkeld2012-11-131-11/+4
| | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicate code. Change-Id: I06523f846e851b2e5766a7a9b078f728c0755c5f
* | | | Merge "Change RPC cleanup ordering"Jenkins2012-11-161-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Change RPC cleanup orderingJeff Peeler2012-11-121-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | RPC cleanup should occur before killing service threadgroup. Otherwise, the connection pool is going to be (attempted) emptied after the thread has been killed. Change-Id: Ie2b2aca495928b7ba39b2175202a072b3592ad72 Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
* | | Don't reference argparse._StoreActionMark McLoughlin2012-11-161-17/+2
| | | | | | | | | | | | | | | | | | | | | This is a private implementation detail of argparse, so we don't want to rely on it. Just sub-class Action instead. Change-Id: Icfcc782cc334d1bc1d4940bec23af48ead692a9d
* | | Fix minor coding style issueMark McLoughlin2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | Use the same style of exception handling used everywhere else. Change-Id: I5436de1996f69ea6210f48c11ef231eb950ad21d
* | | Merge "Remove ConfigCliParser class"Jenkins2012-11-161-22/+6
|\ \ \
| * | | Remove ConfigCliParser classMark McLoughlin2012-11-151-22/+6
| | | | | | | | | | | | | | | | | | | | | | | | This sub-class of ArgumentParser isn't really justified anymore. Change-Id: I705224b6e18e4609a8e2deba283767233b0bd578
* | | | Merge "Add support for positional arguments"Jenkins2012-11-162-51/+113
|\| | |
| * | | Add support for positional argumentsMark McLoughlin2012-11-152-51/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | argparse makes it awkward to implement the current cfg API where we simply return the leftover arguments to the caller. Very few cfg users actually rely on this functionality and for those cases it probably makes more sense for them to explicitly register positional arguments or sub-parsers. Add support for positional arguments via a 'required' Opt attribute: opt = StrOpt('foo', positional=True) conf.register_cli_opt(opt) conf(['bar']) conf.foo == 'bar' Change-Id: Iea746d710237e1ea26c1ef4871643941d1df09bd
* | | | Merge "Use stock argparse behaviour for optional args"Jenkins2012-11-162-3/+2
|\| | |
| * | | Use stock argparse behaviour for optional argsMark McLoughlin2012-11-152-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optparse would print "Options" but argparse prints "optional arguments". The default argparse behaviour is fine, let's stick with that. Change-Id: Ib53a2581af9d776e9a7c1cd90eebe89b70034e57
* | | | Merge "Use stock argparse --usage behaviour"Jenkins2012-11-162-25/+3
|\| | |
| * | | Use stock argparse --usage behaviourMark McLoughlin2012-11-152-25/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | optparse would substitute the program name for %prog, but argparse requires %(prog)s. Also, optparse would print 'Usage:' whereas argparse prints 'usage:'. Neither optparse behaviour that's worth retaining, let's just use the default argparse behaviour. Change-Id: Ied2acb37c366f1a45aed72b6b76f11e2de23828e