x/vmware-nsx
Code Issues Proposed changes

Log msg for load policy file only if the file is actually loaded

Browse Source 
The Load entry was previousy in init(), whereas it should have
been in _set_rules() which is invoked only when policies are
(re)loaded from the json file.

Change-Id: Ib4ce66569a64fc4be8f5f77d7f503cc93ac0006e
This commit is contained in:
Salvatore Orlando 2013-05-05 17:29:37 +02:00
parent 9ad0ba1ae3
commit ea29aebf7c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quantum/policy.py
View File

@ -52,7 +52,6 @@ def init():
raise exceptions.PolicyNotFound(path=cfg.CONF.policy_file) raise exceptions.PolicyNotFound(path=cfg.CONF.policy_file)
# pass _set_brain to read_cached_file so that the policy brain # pass _set_brain to read_cached_file so that the policy brain
# is reset only if the file has changed # is reset only if the file has changed
LOG.debug(_("loading policy file at %s"), _POLICY_PATH)
utils.read_cached_file(_POLICY_PATH, _POLICY_CACHE, utils.read_cached_file(_POLICY_PATH, _POLICY_CACHE,
reload_func=_set_rules) reload_func=_set_rules)
@ -65,6 +64,7 @@ def get_resource_and_action(action):
def _set_rules(data): def _set_rules(data):
default_rule = 'default' default_rule = 'default'
LOG.debug(_("loading policies from file: %s"), _POLICY_PATH)
policy.set_rules(policy.Rules.load_json(data, default_rule)) policy.set_rules(policy.Rules.load_json(data, default_rule))