fix: add fallback for SERVER_URL and API_KEY, add logging
This commit is contained in:
+18
-7
@@ -19,16 +19,20 @@ sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
|
|||||||
|
|
||||||
try:
|
try:
|
||||||
from config import *
|
from config import *
|
||||||
|
print("LOG: ✅ Config импортирован из config.py")
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
print(f"WARNING: Не удалось импортировать config: {e}", file=sys.stderr)
|
print(f"LOG: ⚠️ Не удалось импортировать config: {e}", file=sys.stderr)
|
||||||
SERVER_URL = "https://servicedesk.sibcem.ru:8080"
|
|
||||||
API_KEY = ""
|
|
||||||
|
|
||||||
# Проверяем что SERVER_URL определён
|
# Проверяем что SERVER_URL определён, если нет — используем дефолт
|
||||||
if 'SERVER_URL' not in globals():
|
if 'SERVER_URL' not in globals():
|
||||||
SERVER_URL = "https://servicedesk.sibcem.ru:8080"
|
SERVER_URL = os.environ.get("SD_SERVER_URL", "https://servicedesk.sibcem.ru:8080")
|
||||||
|
print(f"LOG: ⚠️ SERVER_URL не найден в config, используем: {SERVER_URL}")
|
||||||
|
|
||||||
if 'API_KEY' not in globals():
|
if 'API_KEY' not in globals():
|
||||||
API_KEY = ""
|
API_KEY = os.environ.get("SD_API_KEY", "")
|
||||||
|
print("LOG: ⚠️ API_KEY не найден в config, используется пустой", file=sys.stderr)
|
||||||
|
|
||||||
|
print(f"LOG: 🔑 Подключение к {SERVER_URL}")
|
||||||
|
|
||||||
def get_ts(req):
|
def get_ts(req):
|
||||||
ct = req.get("created_time", {})
|
ct = req.get("created_time", {})
|
||||||
@@ -72,16 +76,21 @@ def list_tickets(from_date="2026-07-20"):
|
|||||||
date_obj = datetime.strptime(from_date, "%Y-%m-%d")
|
date_obj = datetime.strptime(from_date, "%Y-%m-%d")
|
||||||
from_date_ms = int(date_obj.replace(tzinfo=__import__('datetime').timezone.utc).timestamp() * 1000)
|
from_date_ms = int(date_obj.replace(tzinfo=__import__('datetime').timezone.utc).timestamp() * 1000)
|
||||||
|
|
||||||
|
print(f"LOG: 📥 Загрузка заявок с {from_date}...")
|
||||||
resp = requests.get(url, headers=headers, verify=False, timeout=30.0)
|
resp = requests.get(url, headers=headers, verify=False, timeout=30.0)
|
||||||
resp.raise_for_status()
|
resp.raise_for_status()
|
||||||
data = resp.json()
|
data = resp.json()
|
||||||
all_reqs = data.get("requests", [])
|
all_reqs = data.get("requests", [])
|
||||||
|
|
||||||
from_date_reqs = [r for r in all_reqs if get_ts(r) >= from_date_ms]
|
from_date_reqs = [r for r in all_reqs if get_ts(r) >= from_date_ms]
|
||||||
|
print(f"LOG: 📋 Найдено заявок с {from_date}: {len(from_date_reqs)}")
|
||||||
|
|
||||||
# Получаем детали для каждой заявки
|
# Получаем детали для каждой заявки
|
||||||
rows = []
|
rows = []
|
||||||
for req in from_date_reqs:
|
for i, req in enumerate(from_date_reqs):
|
||||||
|
if (i + 1) % 10 == 0:
|
||||||
|
print(f" Обработано {i + 1}/{len(from_date_reqs)}...")
|
||||||
|
|
||||||
req_id = req.get("request_id", req.get("id", "?"))
|
req_id = req.get("request_id", req.get("id", "?"))
|
||||||
detail = get_ticket_detail(req_id)
|
detail = get_ticket_detail(req_id)
|
||||||
|
|
||||||
@@ -112,6 +121,8 @@ def list_tickets(from_date="2026-07-20"):
|
|||||||
for row in rows:
|
for row in rows:
|
||||||
print(json.dumps(row, ensure_ascii=False))
|
print(json.dumps(row, ensure_ascii=False))
|
||||||
|
|
||||||
|
print(f"LOG: ✅ Выведено {len(rows)} заявок", file=sys.stderr)
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
from_date = sys.argv[1] if len(sys.argv) > 1 else "2026-07-20"
|
from_date = sys.argv[1] if len(sys.argv) > 1 else "2026-07-20"
|
||||||
list_tickets(from_date)
|
list_tickets(from_date)
|
||||||
|
|||||||
Reference in New Issue
Block a user