From 7207e914f66ddd9000420cb10c9d5f63f8cd7c04 Mon Sep 17 00:00:00 2001 From: Mikhail Chechnev Date: Mon, 10 Dec 2018 16:31:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=BC=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20=D0=B8?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D1=87=D0=B8=D1=8F=20=D0=B0=D0=B4=D1=80=D0=B5?= =?UTF-8?q?=D1=81=D0=B0=20E-Mail=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=BE=D0=B9=20=D1=83=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/service_available_controller.js | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/core/service_available_controller.js b/core/service_available_controller.js index c323113..bd272be 100644 --- a/core/service_available_controller.js +++ b/core/service_available_controller.js @@ -138,24 +138,30 @@ class ServiceAvailableController extends EventEmitter { let nDiffMins = Math.round(((nDiffMs % 86400000) % 3600000) / 60000); //Если простой больше указанного в настройках - будем оповещать по почте if (nDiffMins >= this.services[i].nUnavlblNtfTime) { + //Подготовим тему для уведомления let sSubject = `Удалённый сервис ${this.services[i].sCode} неотвечает на запросы`; + //Подготовим сообщение для уведомления let sMessage = `Сервис недоступен более ${ this.services[i].nUnavlblNtfTime } мин. (${nDiffMins} мин. с момента запуска сервера приложений).\nАдрес сервиса: ${ this.services[i].sSrvRoot }`; + //Положим уведомление в протокол работы сервера приложений await this.logger.error(sMessage, { nServiceId: this.services[i].nId }); - try { - await sendMail({ - mail: this.mail, - sTo: this.services[i].sUnavlblNtfMail, - sSubject, - sMessage - }); - } catch (e) { - await this.logger.error(makeErrorText(e), { - nServiceId: this.services[i].nId - }); + //И в почту, если есть список адресов + if (this.services[i].sUnavlblNtfMail) { + try { + await sendMail({ + mail: this.mail, + sTo: this.services[i].sUnavlblNtfMail, + sSubject, + sMessage + }); + } catch (e) { + await this.logger.error(makeErrorText(e), { + nServiceId: this.services[i].nId + }); + } } } }