|
@@ -4,16 +4,13 @@ import config
|
|
import logging
|
|
import logging
|
|
from core.JabberBot import JabberBot
|
|
from core.JabberBot import JabberBot
|
|
from slixmpp.stanza import Message
|
|
from slixmpp.stanza import Message
|
|
-import jsonAndRequest as jsreq
|
|
|
|
from time import sleep
|
|
from time import sleep
|
|
from core.lib import run_process
|
|
from core.lib import run_process
|
|
from classes.Ticket import Ticket
|
|
from classes.Ticket import Ticket
|
|
from typing import List
|
|
from typing import List
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
from concurrent.futures import ThreadPoolExecutor
|
|
from core.SystemdKiller import SystemdKiller
|
|
from core.SystemdKiller import SystemdKiller
|
|
-from core.utils import get_init_data
|
|
|
|
from core.requesters import TicketRequester
|
|
from core.requesters import TicketRequester
|
|
-from jsonAndRequest import requestGetListUser
|
|
|
|
from config import KEYS
|
|
from config import KEYS
|
|
|
|
|
|
botname = "open_access_request_pending"
|
|
botname = "open_access_request_pending"
|
|
@@ -99,7 +96,7 @@ def start_handler():
|
|
# Фильтрация тикетов
|
|
# Фильтрация тикетов
|
|
tickets = [t for t in processed if t is not None]
|
|
tickets = [t for t in processed if t is not None]
|
|
|
|
|
|
- logging.debug(tickets)
|
|
|
|
|
|
+ logging.debug('Кол-во тикетов:' + str(len(tickets)))
|
|
logging.debug("Sleep")
|
|
logging.debug("Sleep")
|
|
killer.exit_event.wait(timeout=INTERVAL_TIME)
|
|
killer.exit_event.wait(timeout=INTERVAL_TIME)
|
|
|
|
|
|
@@ -110,7 +107,7 @@ def interval_attempts_unlimited(ticket: Ticket) -> None:
|
|
logging.debug(f"Лимит попыток обработки тикета {ticket.id} исчерпан")
|
|
logging.debug(f"Лимит попыток обработки тикета {ticket.id} исчерпан")
|
|
|
|
|
|
|
|
|
|
- ticket_requester.patch(ticket, {"status": 359})
|
|
|
|
|
|
+ response = ticket_requester.patch(ticket, {"status": 359})
|
|
|
|
|
|
# TODO: implement send ticket changed to next handler
|
|
# TODO: implement send ticket changed to next handler
|
|
# bot.send_message(JID, f"Сообщение отправлено {JID}: {datetime.now()}")
|
|
# bot.send_message(JID, f"Сообщение отправлено {JID}: {datetime.now()}")
|
|
@@ -123,12 +120,10 @@ def interval_attempts_unlimited(ticket: Ticket) -> None:
|
|
|
|
|
|
|
|
|
|
def processing(ticket: Ticket) -> None:
|
|
def processing(ticket: Ticket) -> None:
|
|
- logging.debug(f"Начало обработки тикета {ticket.id}")
|
|
|
|
|
|
+ logging.debug(f"Начало обработки тикета {ticket.id}. Лимит: {ticket.interval_attempts}")
|
|
|
|
|
|
message = f"Тикет {ticket.id} ожидает решения"
|
|
message = f"Тикет {ticket.id} ожидает решения"
|
|
|
|
|
|
- print(requestGetListUser())
|
|
|
|
-
|
|
|
|
# send_notification_to_admins(ticket, message)
|
|
# send_notification_to_admins(ticket, message)
|
|
# bot.send_message(ticket.assigned_to, message)
|
|
# bot.send_message(ticket.assigned_to, message)
|
|
|
|
|