From a2fdb91e19266070974cd4e18e7a4115aac25f8c Mon Sep 17 00:00:00 2001 From: bashmak Date: Fri, 14 Apr 2017 15:41:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=B0=D1=82?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D0=B5=D0=BC=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D0=BA=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cron.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/cron.py b/cron.py index 3e16d91..e2a2230 100755 --- a/cron.py +++ b/cron.py @@ -9,7 +9,7 @@ from agent import Transmitter, NasNetworkError, NasFailedResult def main(): - tm = Transmitter() + tm = None users = Abon.objects.all() for user in users: @@ -32,12 +32,13 @@ def main(): # а если нет ip то и синхронизировать абонента без ip нельзя continue - # ищем абонента в списке инфы из nas - tm.update_user(ab) + # обновляем абонента если он статический. Иначе его обновит dhcp + if user.opt82 is None: + if tm is None: + tm = Transmitter() + tm.update_user(ab) - except NasNetworkError as er: - print("Error:", er) - except NasFailedResult as er: + except (NasNetworkError, NasFailedResult) as er: print("Error:", er) except LogicError as er: print("Notice:", er)