From 30f04e017895ccbf2a226652c36389ce189ac334 Mon Sep 17 00:00:00 2001
From: "s.mostryukov" <s.mostryukov@gk-osnova.ru>
Date: Tue, 24 Jun 2025 10:05:08 +0300
Subject: [PATCH] delete debug fix mail send upd docker-compose.yaml

---
 app/backup.py                  | 2 +-
 app/config.py                  | 1 -
 app/config/config-template.ini | 3 +--
 app/main.py                    | 6 ++++--
 docker/docker-compose.yaml     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/backup.py b/app/backup.py
index 21dce7b..a2758ec 100644
--- a/app/backup.py
+++ b/app/backup.py
@@ -78,7 +78,7 @@ def connect_to_device(vendor: str, host: str, name: str="") -> ConnectHandler:
 def send_command(connection: ConnectHandler, command: str) -> str:
     log.info("send command")
     try:
-        result: str = connection.send_command(command, read_timeout=cfg.net_dev.read_timeout, delay_factor=cfg.net_dev.delay_factor)
+        result: str = connection.send_command(command, read_timeout=cfg.net_dev.read_timeout)
         log.info('command send success')
     except exceptions.NetmikoTimeoutException:
         result = "NetmikoTimeoutException"
diff --git a/app/config.py b/app/config.py
index 4f8cd6b..0c4ae27 100644
--- a/app/config.py
+++ b/app/config.py
@@ -68,7 +68,6 @@ class ConfigNetDev:
     pwd: str = os.getenv("NET_DEV_PWD")
     ssh_port: int = config["net_dev"].getint("ssh_port")
     read_timeout: int = config["net_dev"].getint("read_timeout")
-    delay_factor: int = config["net_dev"].getint("delay_factor")
     debug: bool = config["net_dev"].getboolean("debug")
 
 
diff --git a/app/config/config-template.ini b/app/config/config-template.ini
index dc7cfb8..78a9498 100644
--- a/app/config/config-template.ini
+++ b/app/config/config-template.ini
@@ -16,7 +16,7 @@ subject: Warning in backup network device
 # Конфиг гит репозитория
 [git]
 # False \ True - включение\отключение отправки файлов в удалённый репозиторий
-push: True
+push: False
 # Пользователь в локальном гите
 user: net-bcp
 mail: net-bcp@example.com
@@ -41,7 +41,6 @@ debug: False
 # Порт на который подключаться по ssh
 ssh_port: 22
 read_timeout: 30
-delay_factor: 2
 
 [log]
 # Уровень логов в консоль
diff --git a/app/main.py b/app/main.py
index dd3a05f..3ddb90d 100644
--- a/app/main.py
+++ b/app/main.py
@@ -52,8 +52,10 @@ def main():
         if os.path.isfile(log_file):
             with open(log_file, 'r', encoding='utf-8') as file:
                 text = file.read()
-            send_mail(text)
-
+            if text != '':
+                send_mail(text)
+            else:
+                log.info("log file is empty. All backups saved")
 
 
 if __name__ == "__main__":
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index 6939660..e3fc334 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   net-backup:
-    image: git.sm8255082.ru/osnova/net-backup:1.1.0
+    image: git.sm8255082.ru/osnova/net-backup:1.1.6
     restart: "no"
     volumes:
       - ./logs:/app/logs
-- 
2.39.5