summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Brown <browne@vmware.com>2016-06-29 17:26:02 -0700
committerRoman Podoliaka <rpodolyaka@mirantis.com>2016-07-09 01:56:35 +0300
commite0cc306c0a581b84d0a8b9eddfcd77ebf50977e7 (patch)
tree01065459ce67ad29d1a32916e88e8a4c13ad84db
parent58d60ca5b2465c96adec36c286328b1b8b8b512f (diff)
downloadoslo-db-e0cc306c0a581b84d0a8b9eddfcd77ebf50977e7.tar.gz
Set a min and max on the connection_debug option
There is a set allowable minimum and maximum to the connection_debug option of 0 and 100. The config option should enforce this. Change-Id: Ica610ad8fc0875a8be1042f7daba5d0a0c1aad03
-rw-r--r--oslo_db/options.py1
-rw-r--r--oslo_db/sqlalchemy/engines.py2
-rw-r--r--releasenotes/notes/connection_debug_min_max-bf6d53d49be7ca52.yaml7
3 files changed, 9 insertions, 1 deletions
diff --git a/oslo_db/options.py b/oslo_db/options.py
index 89f4cf7..7742686 100644
--- a/oslo_db/options.py
+++ b/oslo_db/options.py
@@ -101,6 +101,7 @@ database_opts = [
'SQLAlchemy.'),
cfg.IntOpt('connection_debug',
default=0,
+ min=0, max=100,
deprecated_opts=[cfg.DeprecatedOpt('sql_connection_debug',
group='DEFAULT')],
help='Verbosity of SQL debugging information: 0=None, '
diff --git a/oslo_db/sqlalchemy/engines.py b/oslo_db/sqlalchemy/engines.py
index 54852b4..3e8bb0a 100644
--- a/oslo_db/sqlalchemy/engines.py
+++ b/oslo_db/sqlalchemy/engines.py
@@ -93,7 +93,7 @@ def _setup_logging(connection_debug=0):
"""
if connection_debug >= 0:
logger = logging.getLogger('sqlalchemy.engine')
- if connection_debug >= 100:
+ if connection_debug == 100:
logger.setLevel(logging.DEBUG)
elif connection_debug >= 50:
logger.setLevel(logging.INFO)
diff --git a/releasenotes/notes/connection_debug_min_max-bf6d53d49be7ca52.yaml b/releasenotes/notes/connection_debug_min_max-bf6d53d49be7ca52.yaml
new file mode 100644
index 0000000..7b0713b
--- /dev/null
+++ b/releasenotes/notes/connection_debug_min_max-bf6d53d49be7ca52.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+ - The allowed values for the ``connection_debug`` option are now restricted to
+ the range between 0 and 100 (inclusive). Previously a number lower than 0
+ or higher than 100 could be given without error. But now, a
+ ``ConfigFileValueError`` will be raised when the option value is outside this
+ range.