Skip to content

Remove the possibility of issue #170 by removing emoji from the boot message only for Windows #173

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

Merged
seratch merged 2 commits into from
Dec 8, 2020
Merged

Remove the possibility of issue #170 by removing emoji from the boot message only for Windows #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
08939d2
Fix #170 by removing emoji from the boot message
seratch Dec 6, 2020
1cac73e
Merge branch 'main' into issue-170-windows
seratch Dec 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions slack_bolt/app/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
from slack_bolt.oauth.oauth_settings import OAuthSettings
from slack_bolt.request import BoltRequest
from slack_bolt.response import BoltResponse
from slack_bolt.util.utils import create_web_client
from slack_bolt.util.utils import create_web_client, get_boot_message
from slack_bolt.workflows.step import WorkflowStep, WorkflowStepMiddleware


Expand Down Expand Up @@ -926,9 +926,9 @@ def start(self) -> None:
:return: None
"""
if self._bolt_app.logger.level > logging.INFO:
print("⚡️ Bolt app is running! (development server)")
print(get_boot_message(development_server=True))
else:
self._bolt_app.logger.info("⚡️ Bolt app is running! (development server)")
self._bolt_app.logger.info(get_boot_message(development_server=True))

try:
self._server.serve_forever(0.05)
Expand Down
5 changes: 3 additions & 2 deletions slack_bolt/app/async_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from slack_bolt.adapter.aiohttp import to_bolt_request, to_aiohttp_response
from slack_bolt.response import BoltResponse
from slack_bolt.util.utils import get_boot_message


class AsyncSlackAppServer:
Expand Down Expand Up @@ -71,8 +72,8 @@ def start(self) -> None:
:return: None
"""
if self.bolt_app.logger.level > logging.INFO:
print("⚡️ Bolt app is running!")
print(get_boot_message())
else:
self.bolt_app.logger.info("⚡️ Bolt app is running!")
self.bolt_app.logger.info(get_boot_message())

web.run_app(self.web_app, host="0.0.0.0", port=self.port)
15 changes: 15 additions & 0 deletions slack_bolt/util/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,18 @@ def create_copy(original: Any) -> Any:
return copy.copy(original)
else:
return copy.deepcopy(original)


def get_boot_message(development_server: bool = False) -> str:
if sys.platform == "win32":
# Some Windows environments may fail to parse this str value
# and result in UnicodeEncodeError
if development_server:
return "Bolt app is running! (development server)"
else:
return "Bolt app is running!"

if development_server:
return "⚡️ Bolt app is running! (development server)"
else:
return "⚡️ Bolt app is running!"