Skip to content

Commit 3554d5b

Browse files
authored
Merge pull request #782 from yarda/priority-inheritance-fix
Priority inheritance fix
2 parents d0bd508 + 166102c commit 3554d5b

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

tuned/profiles/merger.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ def _merge_two(self, profile_a, profile_b):
4545
profile_a.units[unit_name].type = unit.type
4646
profile_a.units[unit_name].enabled = unit.enabled
4747
profile_a.units[unit_name].devices = unit.devices
48+
if unit.priority is not None:
49+
profile_a.units[unit_name].priority = unit.priority
4850
if unit.devices_udev_regex is not None:
4951
profile_a.units[unit_name].devices_udev_regex = unit.devices_udev_regex
5052
if unit.cpuinfo_regex is not None:

tuned/units/manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ def create(self, instances_config):
8989
plugin = self._plugins_repository.create(plugin_name)
9090
plugins_by_name[plugin_name] = plugin
9191
self._plugins.append(plugin)
92-
except tuned.plugins.exceptions.NotSupportedPluginException:
93-
log.info("skipping plugin '%s', not supported on your system" % plugin_name)
92+
except tuned.plugins.exceptions.NotSupportedPluginException as e:
93+
log.info("skipping plugin '%s', not supported on your system: %s" % (plugin_name, e))
9494
continue
9595
except Exception as e:
9696
log.error("failed to initialize plugin %s" % plugin_name)

0 commit comments

Comments
 (0)