From f55b3031921c3dc61ea7c62c2479c19d49ac300b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=B2?= <lev@pochta.ru>
Date: Fri, 5 Dec 2025 12:32:06 +0500
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=BC=D0=BF=D0=BE=D1=80=D1=82?=
 =?UTF-8?q?=D0=B0=20=D0=BC=D0=BE=D0=B4=D1=83=D0=BB=D1=8F=20=D0=B2=20main.p?=
 =?UTF-8?q?y=20=D0=B8=20=D0=B4=D0=BE=D0=B1=D0=B2=D0=B0=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=BE?=
 =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BE=D0=BA=20=D0=B4=D0=BB=D1=8F=20parse=5Fs?=
 =?UTF-8?q?aby.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Jenkinsfile         | 4 +---
 app/error_to_log.py | 2 +-
 app/parse_saby.py   | 7 +++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c97eb69..843e15c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,9 +4,7 @@ pipeline {
   stages {
     stage('recreate > build > run container') {
       steps {
-        // sh "docker-compose up --force-recreate --build parse_saby"
-        sh "docker-compose build --no-cache parse_saby"
-        sh "docker-compose up parse_saby"
+        sh "docker-compose up --force-recreate --build parse_saby"
       }
     }
   }
diff --git a/app/error_to_log.py b/app/error_to_log.py
index dc5c8b8..608c6fd 100644
--- a/app/error_to_log.py
+++ b/app/error_to_log.py
@@ -5,7 +5,7 @@ LOG_FILE = "errors.log"
 def current_datatime():
     return datetime.datetime.now().strftime("[%d-%m-%Y %H:%M:%S]")
 
-def write_to_log(error_message, log_file=LOG_FILE):
+def write_to_log(error_message:str, log_file=LOG_FILE):
     """
     Записывает ошибку в лог-файл с временной меткой
     """
diff --git a/app/parse_saby.py b/app/parse_saby.py
index f053a28..83ac2ce 100644
--- a/app/parse_saby.py
+++ b/app/parse_saby.py
@@ -5,7 +5,7 @@
 import requests
 from bs4 import BeautifulSoup
 import re
-import app.error_to_log as error_to_log
+import error_to_log
 
 def parse_html(url: str):
     """
@@ -86,7 +86,9 @@ def parse_reports(soup:BeautifulSoup, # HTML объект
                 # Добавление всех данных в итоговый словарь            
                 result_dict_data.update({id: (name_title, span.text, from_date, to_date, version)})
         except Exception as e:
-            print(f"Ошибка при обработке отчета {report_title}: ", e)
+            error_message = f"Ошибка при обработке отчета {report_title}: {e}"
+            print(error_message)
+            error_to_log.write_to_log(error_message)
             continue
     return result_dict_data
 
@@ -183,6 +185,7 @@ def process_reports_parse(url_formats = 'https://formats.saby.ru'):
         except Exception as e:
             print(f"Ошибка при обработке отчета {report_title}: {str(e)}")
             error_message = f"ERROR-PARSE_SABY: {e} DATA: {report_title}"
+            error_to_log.write_to_log(error_message)
             continue
     return dict_result