summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-03-25 04:22:14 +0000
committerGerrit Code Review <review@openstack.org>2021-03-25 04:22:14 +0000
commitd8d1269f8fdc1bcdacb6eb708cf3249d4a497a53 (patch)
treeae6d937cce8c4090bbc8e4dadc768b2cec0b92a5
parent2bd45d9b0c07d7857dd37224ee5b913f7e60a907 (diff)
parent4a22f29f1e439d20b66a5f20de1d501b11a4d385 (diff)
downloadpython-ironicclient-d8d1269f8fdc1bcdacb6eb708cf3249d4a497a53.tar.gz
Merge "Make baremetal --debug actually work"
-rw-r--r--ironicclient/shell.py18
-rw-r--r--releasenotes/notes/debug-e9dd680d783fa4b6.yaml5
2 files changed, 23 insertions, 0 deletions
diff --git a/ironicclient/shell.py b/ironicclient/shell.py
index fcb358f..0edc585 100644
--- a/ironicclient/shell.py
+++ b/ironicclient/shell.py
@@ -19,6 +19,7 @@ try:
import ironic_inspector_client
except ImportError:
ironic_inspector_client = None
+import openstack
from openstack import config as os_config
from osc_lib import utils
import pbr.version
@@ -168,8 +169,25 @@ class App(app.App):
)
return parser
+ def _configure_ironic_logging(self):
+ openstack.enable_logging(debug=self.options.debug)
+ # NOTE(dtantsur): I wish logging.basicConfig worked.. but it does not.
+ for name in ('ironicclient', 'ironic_inspector_client'):
+ logger = logging.getLogger(name)
+ logger.setLevel(
+ logging.DEBUG if self.options.debug else logging.WARNING)
+ # warnings are already configured by something else, only configure
+ # debug logging for ironic.
+ if not logger.handlers and self.options.debug:
+ handler = logging.StreamHandler()
+ handler.setFormatter(logging.Formatter(
+ # This is the openstacksdk default value
+ '%(asctime)s %(levelname)s: %(name)s %(message)s'))
+ logger.addHandler(handler)
+
def initialize_app(self, argv):
super(App, self).initialize_app(argv)
+ self._configure_ironic_logging()
self.cloud_region = self.config.get_one(argparse=self.options)
# Compatibility with OSC
self.client_manager = ClientManager(self.cloud_region, self.options)
diff --git a/releasenotes/notes/debug-e9dd680d783fa4b6.yaml b/releasenotes/notes/debug-e9dd680d783fa4b6.yaml
new file mode 100644
index 0000000..9bc8c66
--- /dev/null
+++ b/releasenotes/notes/debug-e9dd680d783fa4b6.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ The ``--debug`` option now works correctly with the built-in ``baremetal``
+ command line tool.