Skip to content

Commit bb3651a

Browse files
committed
Update to newer version of sanic
1 parent c1de2fa commit bb3651a

3 files changed

Lines changed: 16 additions & 23 deletions

File tree

core/__init__.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
from sanic import Sanic
2+
from sanic.config import Config
23
from sanic_session import Session
34

4-
from core.config import Config
5+
from core.config import SiteConfig
56

67
from core.routes import root
78
from core.listeners import listeners
89
# from core.utils import handle_daily_emails
910

1011

11-
def create_app(config_class=Config):
12-
app = Sanic(__name__)
13-
app.config.from_object(Config)
12+
def create_app(config_class: Config=SiteConfig) -> Sanic:
13+
app = Sanic('sharpbit_dev', config=config_class())
1414

1515
# Host static files
1616
app.static('/static', './core/static')
@@ -23,4 +23,4 @@ def create_app(config_class=Config):
2323
Session(app) # sanic_session
2424
# app.add_task(handle_daily_emails)
2525

26-
return app
26+
return app

core/listeners.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
import aiohttp
2-
import brawlstats
32

43
from core.utils import Oauth2
5-
from sanic import Blueprint
4+
from sanic import Blueprint, Sanic
65

76
listeners = Blueprint('listeners')
87

98
@listeners.listener('before_server_start')
10-
async def init(app, loop):
11-
app.session = aiohttp.ClientSession(loop=loop)
12-
app.brawl_client = brawlstats.Client(
13-
token=app.config.BRAWLSTATS_TOKEN,
14-
session=app.session,
15-
is_async=True
16-
)
17-
app.oauth = Oauth2(
18-
app.config.DISCORD_CLIENT_ID,
19-
app.config.DISCORD_CLIENT_SECRET,
9+
async def init(app: Sanic, loop):
10+
app.ctx.aiohttp = aiohttp.ClientSession(loop=loop)
11+
app.ctx.oauth = Oauth2(
12+
client_id=app.config.DISCORD_CLIENT_ID,
13+
client_secret=app.config.DISCORD_CLIENT_SECRET,
2014
scope='identify',
2115
redirect_uri=f"http{'s' if not app.config.DEV else ''}://{app.config.DOMAIN}/callback",
22-
session=app.session
16+
session=app.ctx.aiohttp
2317
)
2418

2519
@listeners.listener('after_server_stop')
26-
async def close_session(app, loop):
27-
await app.session.close()
20+
async def close_session(app: Sanic, loop):
21+
await app.ctx.aiohttp.close()

run.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from core import create_app
22

3-
app = create_app()
4-
53
if __name__ == '__main__':
6-
app.run(port=app.config.PORT)
4+
app = create_app()
5+
app.run(port=app.config.PORT, dev=app.config.DEV)

0 commit comments

Comments
 (0)