x/timmy
Code Issues Proposed changes

Fix incorrect by_node_id override for aggregates

Browse Source
This commit is contained in:
f3flight
2016-05-04 02:15:10 +00:00
parent 06deaa1ed8
commit 7ad64ed18b
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
timmy/nodes.py
View File

@@ -60,12 +60,16 @@ class Node(object):
for field in Node.aggregate_by_role:
for role in self.roles:
try:
getattr(self, field).append(conf.by_role[self.role][field])
override = conf.by_role[self.role][field]
getattr(self, field).append(override)
except:
pass
for field in Node.override_by_id:
try:
setattr(self, field, conf.by_node_id[self.node_id][field])
override = conf.by_node_id[self.node_id][field]
if field in Node.aggregate_by_role:
override = [override]
setattr(self, field, override)
except:
pass