Skip to content

Commit

Permalink
添加tornado xheaders配置
Browse files Browse the repository at this point in the history
  • Loading branch information
xfgryujk committed Aug 22, 2020
1 parent 3877425 commit 1252e19
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 4 deletions.
2 changes: 1 addition & 1 deletion api/chat.py
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ async def on_join_room(self):
int(time.time()),
'blivechat',
2,
'Translation is not allowed in this room, please download to use translation',
'Translation is not allowed in this room. Please download to use translation',
0,
False,
60,
Expand Down
10 changes: 8 additions & 2 deletions config.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,26 @@ def __init__(self):
self.database_url = 'sqlite:///data/database.db'
self.enable_translate = True
self.allow_translate_rooms = {}
self.tornado_xheaders = False

def load(self, path):
config = configparser.ConfigParser()
config.read(path)
try:
config = configparser.ConfigParser()
config.read(path)

app_section = config['app']
self.database_url = app_section['database_url']
self.enable_translate = app_section.getboolean('enable_translate')

allow_translate_rooms = app_section['allow_translate_rooms'].strip()
if allow_translate_rooms == '':
self.allow_translate_rooms = {}
else:
allow_translate_rooms = allow_translate_rooms.split(',')
self.allow_translate_rooms = set(map(lambda id_: int(id_.strip()), allow_translate_rooms))

self.tornado_xheaders = app_section.getboolean('tornado_xheaders')

except (KeyError, ValueError):
logger.exception('Failed to load config:')
return False
Expand Down
6 changes: 6 additions & 0 deletions data/config.ini
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
[app]
# See https://docs.sqlalchemy.org/en/13/core/engines.html#database-urls
database_url = sqlite:///data/database.db

# Enable auto translate to Japanese
enable_translate = true

# Comma separated room IDs in which translation are not allowed. If empty, all are allowed
# Example: allow_translate_rooms = 4895312,22347054,21693691
allow_translate_rooms =

# Set to true if you are using a reverse proxy server such as nginx
tornado_xheaders = false


# DON'T modify this section
[DEFAULT]
database_url = sqlite:///data/database.db
enable_translate = true
allow_translate_rooms =
tornado_xheaders = false
7 changes: 6 additions & 1 deletion main.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,13 @@ def run_server(host, port, debug):
debug=debug,
autoreload=False
)
cfg = config.get_config()
try:
app.listen(port, host)
app.listen(
port,
host,
xheaders=cfg.tornado_xheaders
)
except OSError:
logger.warning('Address is used %s:%d', host, port)
return
Expand Down

0 comments on commit 1252e19

Please sign in to comment.