From c512fd826427e508a8735a9b54cc770fa09a5368 Mon Sep 17 00:00:00 2001 From: Alton MacDonald Date: Wed, 11 Dec 2013 11:52:28 +0100 Subject: added error exceptions for DB locking and added third state to BTS notification --- hlr_mgmt/RegisterIMEI.py | 2 +- hlr_mgmt/SubscriberMonitor.py | 42 +++++++++++++++++++++++++++-------------- hlr_mgmt/__init__.py | 2 +- hlr_mgmt/templates/bts.mako | 20 ++++++++++++++------ hlr_mgmt/templates/layout.mako | 2 +- hlr_mgmt/templates/scripts.mako | 20 ++++++++------------ hlr_mgmt/views.py | 14 +++++++++----- 7 files changed, 62 insertions(+), 40 deletions(-) diff --git a/hlr_mgmt/RegisterIMEI.py b/hlr_mgmt/RegisterIMEI.py index 3df58a4..6dad6aa 100644 --- a/hlr_mgmt/RegisterIMEI.py +++ b/hlr_mgmt/RegisterIMEI.py @@ -116,7 +116,7 @@ class RegisterIMEI(threading.Thread): def run(self): log.debug("starting RegisterIMEI deamon") - self.sqlconn = sqlite3.connect(self.HLR_DB) + self.sqlconn = sqlite3.connect(self.HLR_DB,60) self.cursor = self.sqlconn.cursor() return self.authorize_imei(self.imei) diff --git a/hlr_mgmt/SubscriberMonitor.py b/hlr_mgmt/SubscriberMonitor.py index 50a4704..e4632d3 100644 --- a/hlr_mgmt/SubscriberMonitor.py +++ b/hlr_mgmt/SubscriberMonitor.py @@ -39,25 +39,39 @@ class SubscriberMonitor(threading.Thread): self.bsc_conn = telnet_backend(ip, port) self.active_subscribers = collections.defaultdict() self.active = True - + + def is_running(self): + return self.active + + def connect_to_db(self): self.sqlconn = sqlite3.connect(self.HLR_DB, check_same_thread = False) self.cursor = self.sqlconn.cursor() + def disconnect_from_db(self): + try: + self.sqlconn.close() + except: + pass + def run(self): - self.get_active_subs() - while(self.active): - self.check_new_subs() - self.get_active_subs() - time.sleep(60) - def stop(self): - self.active = False + self.connect_to_db() + self.get_active_subs() + while(self.active): + try: + self.check_new_subs() + self.get_active_subs() + except sqlite3.OperationalError: + pass + time.sleep(60) + def stop(self): + self.active = False + self.disconnect_from_db() - def restart(self): - self.active_subscribers = collections.defaultdict() - self.active = True - - def is_running(self): - return self.active + def restart(self): + self.active_subscribers = collections.defaultdict() + self.active = True + self.disconnect_from_db() + self.connect_to_db() def get_active_subs(self): # query active subscribers diff --git a/hlr_mgmt/__init__.py b/hlr_mgmt/__init__.py index c5b6350..2b257f8 100644 --- a/hlr_mgmt/__init__.py +++ b/hlr_mgmt/__init__.py @@ -91,7 +91,7 @@ def load_settings(): # mcc_mnc was obtained manually from http://mobile-network-codes.com/mobile-network-codes-country-codes.asp # initiates SubscriberMonitor - subMonitor = SubscriberMonitor(settings['provider'], settings['db'], ip=settings['bsc_ip'] port=settings['bsc_port']) + subMonitor = SubscriberMonitor(settings['provider'], settings['db'], ip=settings['bsc_ip'], port=settings['bsc_port']) subMonitor.setDaemon(True) subMonitor.start() settings['subMonitor'] = subMonitor diff --git a/hlr_mgmt/templates/bts.mako b/hlr_mgmt/templates/bts.mako index 0f7a08b..04159b7 100644 --- a/hlr_mgmt/templates/bts.mako +++ b/hlr_mgmt/templates/bts.mako @@ -12,10 +12,14 @@ % if bts and phys_cfg: @@ -27,10 +31,14 @@
% endif

BTS ${i} - % if bts[i].has_key('ip'): - (${bts[i]['ip']}) + % if bts[i]['oml_state']: + % if bts[i].has_key('ip'): + (${bts[i]['ip']}) + % else: + (OML connected without IP address) + % endif % else: - (not connected) + (OML disconnected) % endif
${bts[i]['description']}

diff --git a/hlr_mgmt/templates/layout.mako b/hlr_mgmt/templates/layout.mako index dabffe5..b259009 100644 --- a/hlr_mgmt/templates/layout.mako +++ b/hlr_mgmt/templates/layout.mako @@ -36,7 +36,7 @@
- +
    diff --git a/hlr_mgmt/templates/scripts.mako b/hlr_mgmt/templates/scripts.mako index 589c8fc..6d76daf 100644 --- a/hlr_mgmt/templates/scripts.mako +++ b/hlr_mgmt/templates/scripts.mako @@ -28,7 +28,7 @@ - LCR + LCR
    (Local GSM Call Routing)
    % if service_status['lcr']: % if service_status['lcr'].find("running")>0: Running @@ -43,7 +43,7 @@ - Asterisk + Asterisk
    (External Call Routing)
    % if service_status['asterisk']: % if service_status['asterisk'].find("failed")<0: Running @@ -58,7 +58,7 @@ - GGSN + GGSN
    (Data Gateway)
    % if service_status['ggsn']: % if service_status['ggsn'].find("failed")<0: Running @@ -73,7 +73,7 @@ - OpenBSC + OpenBSC
    (Controls GSM Access)
    % if service_status['nitb']: % if service_status['nitb'].find("failed")<0: Running @@ -88,7 +88,7 @@ - OsmoSGSN + OsmoSGSN
    (GPRS Data Interface)
    % if service_status['sgsn']: % if service_status['sgsn'].find("failed")<0: Running @@ -103,15 +103,11 @@ - SubscriberMonitor + SubscriberMonitor
    (Greets users with SMS)
    % if service_status['subMonitor']: - % if service_status['subMonitor']==True: - Running - % else: - Stopped - % endif + Running % else: - ERROR + Stopped % endif diff --git a/hlr_mgmt/views.py b/hlr_mgmt/views.py index 98ff47a..50f0ef0 100644 --- a/hlr_mgmt/views.py +++ b/hlr_mgmt/views.py @@ -52,11 +52,14 @@ def connect_sgsn(settings): return sgsn def db_execute(db, sql_string, params=None): - if params==None: - rs = db.execute(sql_string) - else: - rs = db.execute(sql_string, params) - db.commit() + try: + if params==None: + rs = db.execute(sql_string) + else: + rs = db.execute(sql_string, params) + db.commit() + except sqlite3.OperationalError: + rs = [] return rs def db_query(db, sql_string, params=None): @@ -240,6 +243,7 @@ def bts_view(request): bts[i]['timeslots'] = collections.defaultdict() bts[i]['stats'] = bsc.get_bts_info(str(i)) bts[i]['description'] = bts[i]['stats'][1].split(": ")[1].strip() + bts[i]['oml_state'] = (bts[i]['stats'][15].split(": ")[1] == "connected.") for j in range(0,8): helper = bsc.get_timeslot_info(str(i), str(j)) bts[i]['timeslots'][j] = helper[0].replace("cfg","cfg:") + "," + helper[1] -- cgit v1.2.3