From 81f38e5aa3d899624d126abe109cb4860960c5c6 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 4 Feb 2017 12:04:59 +0000 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=BA=D1=83=20=D0=B8?= =?UTF-8?q?=D1=81=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=20"connection=20refused"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- agent/mod_mikrotik.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/agent/mod_mikrotik.py b/agent/mod_mikrotik.py index 90fc4df..626006c 100644 --- a/agent/mod_mikrotik.py +++ b/agent/mod_mikrotik.py @@ -136,10 +136,13 @@ class MikrotikTransmitter(BaseTransmitter): ip = ip or settings.NAS_IP if not ping(ip): raise NasNetworkError('NAS %s не пингуется' % ip) - s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - s.connect((ip, port or settings.NAS_PORT)) - self.ar = ApiRos(s) - self.ar.login(login or settings.NAS_LOGIN, password or settings.NAS_PASSW) + try: + s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + s.connect((ip, port or settings.NAS_PORT)) + self.ar = ApiRos(s) + self.ar.login(login or settings.NAS_LOGIN, password or settings.NAS_PASSW) + except ConnectionRefusedError: + raise NasNetworkError('Подключение к %s отклонено (Connection Refused)' % ip) def _exec_cmd(self, cmd): assert isinstance(cmd, list)