Переделал нахуй всё

utils/LogCon.py

@@ -1,12 +1,16 @@
 import logging
 from logging.handlers import TimedRotatingFileHandler
 
+import json
+import os
+
+
 def setup_logger():
     logger = logging.getLogger(__name__)
     logger.setLevel(logging.INFO)
 
     handler = TimedRotatingFileHandler(
-        "/logs/app.log",
+        "logs/app.log",
         when="midnight",
         interval=1,
         backupCount=7,
@@ -19,3 +23,14 @@ def setup_logger():
     logger.addHandler(handler)
     
     return logger
+
+
+def load_config(config_path='config/config.json'):
+    """
+    Загрузка конфигурации из JSON файла.
+    """
+    if not os.path.exists(config_path):
+        raise FileNotFoundError(f"Конфигурационный файл не найден: {config_path}")
+    
+    with open(config_path, 'r') as file:
+        return json.load(file)

utils/panel.py

@@ -3,11 +3,11 @@ import uuid
 import string
 import secrets
 import json 
-from logger_config import setup_logger 
+from utils.LogCon import setup_logger, load_config
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta  
 
-with open('config.json', 'r') as file : config = json.load(file)
+config = load_config()
 
 
 
@@ -31,41 +31,49 @@ class PanelInteraction:
 
     def login(self):
         login_url = self.base_url + "/login"
-        self.logger.info(f"Login URL : {login_url}")
-        response = requests.post(login_url, data=self.login_data, verify=False)
-        if response.status_code == 200:
+        self.logger.info(f"Attempting to login at: {login_url}")
+        try:
+            response = requests.post(login_url, data=self.login_data, verify=False, timeout=10)
+            response.raise_for_status()
             session_id = response.cookies.get("3x-ui")
-            return session_id
-        else:
-            self.logger.error(f"Login failed: {response.status_code}")
+            if session_id:
+                return session_id
+            else:
+                self.logger.error(f"Login failed: {response.status_code}")
+                self.logger.debug(f"Response content: {response.text}")
+                return None
+        except requests.RequestException as e:
+            self.logger.error(f"Login request failed: {e}")
             return None
-    
+
     def getInboundInfo(self, inboundId):
         url = f"{self.base_url}/panel/api/inbounds/get/{inboundId}"
         try:
-            response = requests.get(url, headers=self.headers, verify=False)
-            if response.status_code == 200:
+            response = requests.get(url, headers=self.headers, verify=False, timeout=10)
+            response.raise_for_status()
+            if response:
                 return response.json()
             else:
                 self.logger.error(f"Failed to get inbound info: {response.status_code}")
                 self.logger.debug("Response:", response.text)
                 return None
-        finally:
-            self.logger.info("Finished attempting to get inbound info.")
+        except requests.RequestException as e:
+            self.logger.error(f"Get inbound request failed: {e}")
         
     def get_client_traffic(self, email):
         url = f"{self.base_url}/panel/api/inbounds/getClientTraffics/{email}"
         try:
-            response = requests.get(url, headers=self.headers, verify=False)
-            if response.status_code == 200:
+            response = requests.get(url, headers=self.headers, verify=False, timeout=10)
+            response.raise_for_status()
+            if response:
                 return response.json()
             else:
                 self.logger.error(f"Failed to get client traffic: {response.status_code}")
                 self.logger.debug("Response:", response.text)
                 return None
-        finally:
-            self.logger.info("Finished attempting to get client traffic.")
-    
+        except requests.RequestException as e:
+            self.loggin.error(f"Get client request failed: {e}")
+        
     def update_client_expiry(self, client_uuid, new_expiry_time, client_email):
         url = f"{self.base_url}/panel/api/inbounds/updateClient"
         update_data = {
@@ -88,12 +96,13 @@ class PanelInteraction:
         }
         try:
             response = requests.post(url, headers=self.headers, json=update_data, verify=False)
-            if response.status_code == 200:
+            response.raise_for_status()
+            if response:
                 self.logger.debug("Client expiry time updated successfully.")
             else:
-                self.logger.error(f"Failed to update client: {response.status_code} {response.text}")
-        finally:
-            self.logger.info("Finished attempting to update client expiry.")
+                self.logger.error(f"Failed to update client: {response.status_code},   {response.text}")
+        except requests.RequestException as e:
+            self.logger.error(f"Update client request failed: {e}")
 
     def add_client(self, inbound_id, expiry_date,email):
         url = f"{self.base_url}/panel/api/inbounds/addClient"