From: Salvatore Orlando <salv.orlando@gmail.com>
Date: Sun, 5 May 2013 15:29:37 +0000 (+0200)
Subject: Log msg for load policy file only if the file is actually loaded
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ea29aebf7ca7f3843579d5d860d31723bd04af57;p=openstack-build%2Fneutron-build.git

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

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
---

diff --git a/quantum/policy.py b/quantum/policy.py
index 7d101a455..3f74dff95 100644
--- a/quantum/policy.py
+++ b/quantum/policy.py
@@ -52,7 +52,6 @@ def init():
             raise exceptions.PolicyNotFound(path=cfg.CONF.policy_file)
     # pass _set_brain to read_cached_file so that the policy brain
     # 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,
                            reload_func=_set_rules)
 
@@ -65,6 +64,7 @@ def get_resource_and_action(action):
 
 def _set_rules(data):
     default_rule = 'default'
+    LOG.debug(_("loading policies from file: %s"), _POLICY_PATH)
     policy.set_rules(policy.Rules.load_json(data, default_rule))