Skip to content

Commit 97a55d8

Browse files
committed
Pass the Bolt logger in default WebClient instantiation
1 parent 3e483fe commit 97a55d8

File tree

7 files changed

+23
-8
lines changed

7 files changed

+23
-8
lines changed

slack_bolt/adapter/aws_lambda/lambda_s3_oauth_flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def __init__(
7272
@property
7373
def client(self) -> WebClient:
7474
if self._client is None:
75-
self._client = create_web_client()
75+
self._client = create_web_client(logger=self.logger)
7676
return self._client
7777

7878
@property

slack_bolt/app/app.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,11 @@ def __init__(
138138
warning_client_prioritized_and_token_skipped()
139139
)
140140
else:
141-
self._client = create_web_client(token) # NOTE: the token here can be None
141+
self._client = create_web_client(
142+
# NOTE: the token here can be None
143+
token=token,
144+
logger=self._framework_logger,
145+
)
142146

143147
# --------------------------------------
144148
# Authorize & OAuthFlow initialization

slack_bolt/app/async_app.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,11 @@ def __init__(
145145
warning_client_prioritized_and_token_skipped()
146146
)
147147
else:
148-
# NOTE: the token here can be None
149-
self._async_client = create_async_web_client(token)
148+
self._async_client = create_async_web_client(
149+
# NOTE: the token here can be None
150+
token=token,
151+
logger=self._framework_logger,
152+
)
150153

151154
# --------------------------------------
152155
# Authorize & OAuthFlow initialization

slack_bolt/oauth/async_oauth_flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class AsyncOAuthFlow:
3939
@property
4040
def client(self) -> AsyncWebClient:
4141
if self._async_client is None:
42-
self._async_client = create_async_web_client()
42+
self._async_client = create_async_web_client(logger=self.logger)
4343
return self._async_client
4444

4545
@property

slack_bolt/oauth/oauth_flow.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class OAuthFlow:
3838
@property
3939
def client(self) -> WebClient:
4040
if self._client is None:
41-
self._client = create_web_client()
41+
self._client = create_web_client(logger=self.logger)
4242
return self._client
4343

4444
@property

slack_bolt/util/async_utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
1+
from logging import Logger
12
from typing import Optional
23

34
from slack_sdk.web.async_client import AsyncWebClient
45

56
from slack_bolt.version import __version__ as bolt_version
67

78

8-
def create_async_web_client(token: Optional[str] = None) -> AsyncWebClient:
9+
def create_async_web_client(
10+
token: Optional[str] = None, logger: Optional[Logger] = None
11+
) -> AsyncWebClient:
912
return AsyncWebClient(
1013
token=token,
14+
logger=logger,
1115
user_agent_prefix=f"Bolt-Async/{bolt_version}",
1216
)

slack_bolt/util/utils.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import copy
22
import sys
3+
from logging import Logger
34
from typing import Optional, Union, Dict, Any, Sequence, Callable
45

56
from slack_sdk import WebClient
@@ -9,9 +10,12 @@
910
from slack_bolt.version import __version__ as bolt_version
1011

1112

12-
def create_web_client(token: Optional[str] = None) -> WebClient:
13+
def create_web_client(
14+
token: Optional[str] = None, logger: Optional[Logger] = None
15+
) -> WebClient:
1316
return WebClient(
1417
token=token,
18+
logger=logger,
1519
user_agent_prefix=f"Bolt/{bolt_version}",
1620
)
1721

0 commit comments

Comments
 (0)