From cd7525dcbd8f167bedda96fd0426e8f2593a9589 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Mar 2020 12:15:19 -0500 Subject: [PATCH] Revert "pybind/mgr/mgr_module: fix standby module logging options" This reverts commit abcee7133b87d60c841ad2ed589858e4dd347ed8. Breaks the reporting of these options up through the mgr daemon, because PyModule::load_options() happens before the module ctor excutes. Signed-off-by: Sage Weil --- src/pybind/mgr/mgr_module.py | 38 +++++++++++++++--------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/src/pybind/mgr/mgr_module.py b/src/pybind/mgr/mgr_module.py index f08963c1981..c91d405f4c5 100644 --- a/src/pybind/mgr/mgr_module.py +++ b/src/pybind/mgr/mgr_module.py @@ -451,25 +451,7 @@ class FileHandler(logging.FileHandler): self.setFormatter(logging.Formatter("%(asctime)s [%(threadName)s] [%(levelname)-4s] [%(name)s] %(message)s")) -def _define_logging_options(cls): - cls.MODULE_OPTIONS.append( - Option(name='log_level', type='str', default="", runtime=True, - enum_allowed=['info', 'debug', 'critical', 'error', - 'warning', ''])) - cls.MODULE_OPTIONS.append( - Option(name='log_to_file', type='bool', default=False, runtime=True)) - if not [x for x in cls.MODULE_OPTIONS if x['name'] == 'log_to_cluster']: - cls.MODULE_OPTIONS.append( - Option(name='log_to_cluster', type='bool', default=False, - runtime=True)) - cls.MODULE_OPTIONS.append( - Option(name='log_to_cluster_level', type='str', default='info', - runtime=True, - enum_allowed=['info', 'debug', 'critical', 'error', - 'warning', ''])) - class MgrModuleLoggingMixin(object): - def _configure_logging(self, mgr_level, module_level, cluster_level, log_to_file, log_to_cluster): self._mgr_level = None @@ -599,8 +581,6 @@ class MgrStandbyModule(ceph_module.BaseMgrStandbyModule, MgrModuleLoggingMixin): super(MgrStandbyModule, self).__init__(capsule) self.module_name = module_name - _define_logging_options(self) - # see also MgrModule.__init__() for o in self.MODULE_OPTIONS: if 'default' in o: @@ -709,8 +689,6 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): self.module_name = module_name super(MgrModule, self).__init__(py_modules_ptr, this_ptr) - _define_logging_options(self) - for o in self.MODULE_OPTIONS: if 'default' in o: if 'type' in o: @@ -747,6 +725,22 @@ class MgrModule(ceph_module.BaseMgrModule, MgrModuleLoggingMixin): @classmethod def _register_commands(cls, module_name): + cls.MODULE_OPTIONS.append( + Option(name='log_level', type='str', default="", runtime=True, + enum_allowed=['info', 'debug', 'critical', 'error', + 'warning', ''])) + cls.MODULE_OPTIONS.append( + Option(name='log_to_file', type='bool', default=False, runtime=True)) + if not [x for x in cls.MODULE_OPTIONS if x['name'] == 'log_to_cluster']: + cls.MODULE_OPTIONS.append( + Option(name='log_to_cluster', type='bool', default=False, + runtime=True)) + cls.MODULE_OPTIONS.append( + Option(name='log_to_cluster_level', type='str', default='info', + runtime=True, + enum_allowed=['info', 'debug', 'critical', 'error', + 'warning', ''])) + cls.COMMANDS.extend(CLICommand.dump_cmd_list()) @property -- 2.39.5