LBRYCommunity/comment-server
1
0
Fork 0
Code Issues 18 Pull requests 1 Projects Releases Packages Wiki Activity

Better application management

Browse source
This commit is contained in:
Oleg Silkin 2019-07-22 08:14:07 -04:00
parent 8af6a9eb07
commit 16f7a6efa3
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/app.py
View file

@ -2,6 +2,7 @@
import logging import logging
import pathlib import pathlib
import re import re
import time
import aiojobs import aiojobs
import aiojobs.aiohttp import aiojobs.aiohttp
@ -32,7 +33,7 @@ async def database_backup_routine(app):
try: try:
while True: while True:
await asyncio.sleep(app['config']['BACKUP_INT']) await asyncio.sleep(app['config']['BACKUP_INT'])
with obtain_connection(app['db_path']) as conn: with app['reader'] as conn:
logger.debug('backing up database') logger.debug('backing up database')
schema.db_helpers.backup_database(conn, app['backup']) schema.db_helpers.backup_database(conn, app['backup'])
except asyncio.CancelledError: except asyncio.CancelledError:
@ -50,7 +51,7 @@ async def start_background_tasks(app: web.Application):
def insert_to_config(app, conf=None, db_file=None): def insert_to_config(app, conf=None, db_file=None):
db_file = db_file if db_file else 'DEFAULT' db_file = db_file if db_file else 'DEFAULT'
app['config'] = conf if conf else config app['config'] = conf
app['db_path'] = conf['PATH'][db_file] app['db_path'] = conf['PATH'][db_file]
app['backup'] = re.sub(r'\.db$', '.backup.db', app['db_path']) app['backup'] = re.sub(r'\.db$', '.backup.db', app['db_path'])
assert app['db_path'] != app['backup'] assert app['db_path'] != app['backup']
@ -66,6 +67,7 @@ async def cleanup_background_tasks(app):
def create_app(conf, db_path='DEFAULT', **kwargs): def create_app(conf, db_path='DEFAULT', **kwargs):
app = web.Application() app = web.Application()
app['START_TIME'] = int(time.time())
insert_to_config(app, conf, db_path) insert_to_config(app, conf, db_path)
app.on_startup.append(setup_db_schema) app.on_startup.append(setup_db_schema)
app.on_startup.append(start_background_tasks) app.on_startup.append(start_background_tasks)
@ -83,8 +85,13 @@ def create_app(conf, db_path='DEFAULT', **kwargs):
def run_app(config): def run_app(config):
appl = create_app(conf=config, db_path='DEFAULT', close_timeout=5.0) appl = create_app(conf=config, db_path='DEFAULT', close_timeout=5.0)
try: try:
asyncio.run(web.run_app(appl, access_log=logging.getLogger('aiohttp.access'), host=config['HOST'], port=config['PORT'])) asyncio.run(web.run_app(
app=appl,
access_log=logging.getLogger('aiohttp.access'),
host=config['HOST'],
port=config['PORT']
))
except asyncio.CancelledError: except asyncio.CancelledError:
pass logging.warning('Server going down, asyncio loop raised cancelled error:')
except ValueError: except ValueError:
pass logging.exception('Server going down due to value error:')