Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove error log and replace with debug log #1911

Merged
merged 1 commit into from
May 14, 2022
Merged

Remove error log and replace with debug log #1911

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
38 changes: 18 additions & 20 deletions opsdroid/connector/slack/connector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,18 @@

import aiohttp
import certifi
import opsdroid.events
from emoji import demojize

from opsdroid.connector import Connector, register_event
from opsdroid.connector.slack.create_events import SlackEventCreator
from opsdroid.connector.slack.events import Blocks, EditedBlocks
from slack_sdk.errors import SlackApiError
from slack_sdk.socket_mode.aiohttp import SocketModeClient
from slack_sdk.socket_mode.request import SocketModeRequest
from slack_sdk.socket_mode.response import SocketModeResponse
from slack_sdk.web.async_client import AsyncWebClient
from voluptuous import Required

import opsdroid.events
from opsdroid.connector import Connector, register_event
from opsdroid.connector.slack.create_events import SlackEventCreator
from opsdroid.connector.slack.events import Blocks, EditedBlocks

_LOGGER = logging.getLogger(__name__)

_USE_BOT_TOKEN_MSG = (
Expand Down Expand Up @@ -139,6 +137,7 @@ async def disconnect(self):

Cancels the event queue worker task and disconnects the
socket_mode_client if socket mode was enabled."""

if self._event_queue_task:
self._event_queue_task.cancel()
await asyncio.gather(self._event_queue_task, return_exceptions=True)
Expand Down Expand Up @@ -177,6 +176,7 @@ def _generate_base_data(self, event: opsdroid.events.Event) -> dict:
data["thread_ts"] = raw_event["thread_ts"]
elif self.start_thread:
data["thread_ts"] = event.linked_event.event_id

return data

async def event_handler(self, payload):
Expand All @@ -191,21 +191,19 @@ async def event_handler(self, payload):
else:
event = await self._event_creator.create_event(payload, None)

if not event:
_LOGGER.error(
"Payload: %s is not implemented. Event wont be parsed", payload
)
if event:
if isinstance(event, list):
for e in event:
_LOGGER.debug(f"Got slack event: {e}")
await self.opsdroid.parse(e)

return

if isinstance(event, list):
for e in event:
_LOGGER.debug(f"Got slack event: {e}")
await self.opsdroid.parse(e)

if isinstance(event, opsdroid.events.Event):
_LOGGER.debug(f"Got slack event: {event}")
await self.opsdroid.parse(event)
if isinstance(event, opsdroid.events.Event):
_LOGGER.debug(f"Got slack event: {event}")
await self.opsdroid.parse(event)
else:
_LOGGER.debug(
"Event returned empty for payload: %s. Event was not parsed", payload
)

async def socket_event_handler(
self, client: SocketModeClient, req: SocketModeRequest
Expand Down