From 3bdf337098fd70fea58b077837bf273db223de20 Mon Sep 17 00:00:00 2001 From: Dmitry Novikov Date: Mon, 31 Jul 2017 11:48:22 +0300 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B3=D0=BD=D0=BE=D1=80=D0=B8=D0=BC=20?= =?UTF-8?q?=D0=BD=D0=B5=20=D1=81=D1=82=D0=B0=D0=BD=D0=B4=D0=B0=D1=80=D1=82?= =?UTF-8?q?=D0=BD=D1=8B=D0=B5=20=D0=B8=D0=BC=D0=B5=D0=BD=D0=B0=20queue=20?= =?UTF-8?q?=D0=B2=20=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=82=D0=B8=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/mod_mikrotik.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 2e515c5..e1345b3 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -201,15 +201,18 @@ class TransmitterManager(BaseTransmitter, metaclass=ABCMeta): speedIn=parse_speed(speeds[1]), speedOut=parse_speed(speeds[0]) ) - a = AbonStruct( - uid=int(info['=name'][3:]), - # FIXME: тут в разных микротиках или =target-addresses или =target - ip=info['=target'][:-3], - tariff=t, - is_active=False if info['=disabled'] == 'false' else True - ) - a.queue_id = info['=.id'] - return a + try: + a = AbonStruct( + uid=int(info['=name'][3:]), + # FIXME: тут в разных микротиках или =target-addresses или =target + ip=info['=target'][:-3], + tariff=t, + is_active=False if info['=disabled'] == 'false' else True + ) + a.queue_id = info['=.id'] + return a + except ValueError: + pass class QueueManager(TransmitterManager, metaclass=ABCMeta):