diff options
| author | Ronald Bradford <ronald.bradford@gmail.com> | 2016-02-02 20:38:02 +0000 |
|---|---|---|
| committer | Ronald Bradford <ronald.bradford@gmail.com> | 2016-02-04 18:37:40 +0000 |
| commit | 6d104a3b412fc0a649bfd3246de95ed1f5b94a4a (patch) | |
| tree | 0b09e2cb68f83afa0284439e3920b1097b0f68ec | |
| parent | 22afa47ca74b1cd5cab9b723d6e0fe1ebcd622cd (diff) | |
| download | oslo-rootwrap-6d104a3b412fc0a649bfd3246de95ed1f5b94a4a.tar.gz | |
Remove unused use-syslog-rfc-format option
Remove this option that appears ignored. For reference by similar name
only, this option is marked as deprecated and to be removed from oslo.log
in Mitaka. Refer to I9b77899fe437d359df2a15961866b194b564ca48.
Change-Id: I9a97b53d829a9ca6b92ee4b545f616a3bc5b25be
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | doc/source/usage.rst | 5 | ||||
| -rw-r--r-- | etc/rootwrap.conf.sample | 5 | ||||
| -rw-r--r-- | oslo_rootwrap/tests/test_rootwrap.py | 7 | ||||
| -rw-r--r-- | oslo_rootwrap/wrapper.py | 7 |
5 files changed, 1 insertions, 24 deletions
@@ -5,6 +5,7 @@ ChangeLog *.pyc *.log .tox +.eggs* .coverage oslo.rootwrap.egg-info/ build/ diff --git a/doc/source/usage.rst b/doc/source/usage.rst index 8508a46..56f4bcb 100644 --- a/doc/source/usage.rst +++ b/doc/source/usage.rst @@ -102,11 +102,6 @@ use_syslog Enable logging to syslog. Default value is False. Example: ``use_syslog=True`` -use_syslog_rfc_format - Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part). - Default value is False. Example: - ``use_syslog_rfc_format=True`` - syslog_log_facility Which syslog facility to use for syslog logging. Valid values include ``auth``, ``authpriv``, ``syslog``, ``user0``, ``user1``... diff --git a/etc/rootwrap.conf.sample b/etc/rootwrap.conf.sample index 197b84c..a29f501 100644 --- a/etc/rootwrap.conf.sample +++ b/etc/rootwrap.conf.sample @@ -16,11 +16,6 @@ exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin # Default value is False use_syslog=False -# Enable RFC5424 compliant format for syslog (add APP-NAME before MSG part) -# Default value is False - no format changes -# TODO(bogdando) remove or use True after existing syslog format deprecation in J -use_syslog_rfc_format=False - # Which syslog facility to use. # Valid values include auth, authpriv, syslog, user0, user1... # Default value is 'syslog' diff --git a/oslo_rootwrap/tests/test_rootwrap.py b/oslo_rootwrap/tests/test_rootwrap.py index 22c23b5..3bd2a76 100644 --- a/oslo_rootwrap/tests/test_rootwrap.py +++ b/oslo_rootwrap/tests/test_rootwrap.py @@ -421,7 +421,6 @@ class RootwrapTestCase(testtools.TestCase): self.assertEqual(c.exec_dirs, []) self.assertFalse(config.use_syslog) - self.assertFalse(config.use_syslog_rfc_format) self.assertEqual(config.syslog_log_facility, logging.handlers.SysLogHandler.LOG_SYSLOG) self.assertEqual(config.syslog_log_level, logging.ERROR) @@ -437,12 +436,6 @@ class RootwrapTestCase(testtools.TestCase): config = wrapper.RootwrapConfig(raw) self.assertTrue(config.use_syslog) - raw.set('DEFAULT', 'use_syslog_rfc_format', 'oui') - self.assertRaises(ValueError, wrapper.RootwrapConfig, raw) - raw.set('DEFAULT', 'use_syslog_rfc_format', 'true') - config = wrapper.RootwrapConfig(raw) - self.assertTrue(config.use_syslog_rfc_format) - raw.set('DEFAULT', 'syslog_log_facility', 'moo') self.assertRaises(ValueError, wrapper.RootwrapConfig, raw) raw.set('DEFAULT', 'syslog_log_facility', 'local0') diff --git a/oslo_rootwrap/wrapper.py b/oslo_rootwrap/wrapper.py index 36a5287..2846011 100644 --- a/oslo_rootwrap/wrapper.py +++ b/oslo_rootwrap/wrapper.py @@ -87,13 +87,6 @@ class RootwrapConfig(object): else: self.use_syslog = False - # use_syslog_rfc_format - if config.has_option("DEFAULT", "use_syslog_rfc_format"): - self.use_syslog_rfc_format = config.getboolean( - "DEFAULT", "use_syslog_rfc_format") - else: - self.use_syslog_rfc_format = False - def setup_syslog(execname, facility, level): rootwrap_logger = logging.getLogger() |