From 76282bbcb41acbf519a1880b49644c1e722bf4b0 Mon Sep 17 00:00:00 2001 From: Marc Pilon Date: Wed, 18 Dec 2013 13:18:39 -0500 Subject: [PATCH] [API] Disallow MnB messages if disabled Change-Id: If912fcf573217afe65d1b330274db335d34d199a --- libra/admin_api/stats/stats_sched.py | 4 ++-- libra/common/api/mnb.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libra/admin_api/stats/stats_sched.py b/libra/admin_api/stats/stats_sched.py index cee08efe..e275f47b 100644 --- a/libra/admin_api/stats/stats_sched.py +++ b/libra/admin_api/stats/stats_sched.py @@ -42,8 +42,8 @@ class UsageStats(object): self.start_stats_sched() def shutdown(self): - if self.billing_timer: - self.billing_timer.cancel() + if self.stats_timer: + self.stats_timer.cancel() def gather_stats(self): # Work out if it is our turn to run diff --git a/libra/common/api/mnb.py b/libra/common/api/mnb.py index d495d3f3..4ef8558d 100644 --- a/libra/common/api/mnb.py +++ b/libra/common/api/mnb.py @@ -31,8 +31,10 @@ LOG = logging.getLogger(__name__) def update_mnb(event_type, lbid, tenant_id): - # Start a new thread - eventlet.spawn_n(client_job, event_type, lbid, tenant_id) + + if cfg.CONF['admin_api'].billing_enable: + # Start a new thread + eventlet.spawn_n(client_job, event_type, lbid, tenant_id) def client_job(event_type, lbid, tenant_id):