Compare commits
No commits in common. "6f3df5fc516717020d7295768fbd1d3abf8b5d05" and "a9b1e22b47d5bd3b07465437648e170071089a17" have entirely different histories.
6f3df5fc51
...
a9b1e22b47
@ -1,11 +1,10 @@
|
||||
from flask import Flask, request, send_from_directory
|
||||
from flask import Flask, request
|
||||
from flask_sqlalchemy import SQLAlchemy
|
||||
from flask_login import LoginManager
|
||||
import yaml
|
||||
import logging
|
||||
import time
|
||||
import traceback
|
||||
import os
|
||||
|
||||
# init SQLAlchemy so we can use it later in our models
|
||||
db = SQLAlchemy()
|
||||
@ -60,30 +59,17 @@ logger = logging.getLogger('waitress')
|
||||
logger.setLevel(app.config['LOGGING_LEVEL'])
|
||||
|
||||
|
||||
def get_actual_addr(request):
|
||||
ip = request.remote_addr
|
||||
if request.headers.getlist("X-Forwarded-For"):
|
||||
ip = request.headers.getlist("X-Forwarded-For")[0]
|
||||
return ip
|
||||
|
||||
|
||||
@app.route('/favicon.ico')
|
||||
def favicon():
|
||||
return send_from_directory(os.path.join(app.root_path, 'static'),
|
||||
'favicon.ico', mimetype='image/vnd.microsoft.icon')
|
||||
|
||||
|
||||
@app.before_request
|
||||
def before_request():
|
||||
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
|
||||
logger.info('%s > %s %s %s %s', timestamp, get_actual_addr(request),
|
||||
logger.info('%s > %s %s %s %s', timestamp, request.remote_addr,
|
||||
request.method, request.scheme, request.full_path)
|
||||
|
||||
|
||||
@app.after_request
|
||||
def after_request(response):
|
||||
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
|
||||
logger.info('%s < %s %s %s %s %s', timestamp, get_actual_addr(request),
|
||||
logger.info('%s < %s %s %s %s %s', timestamp, request.remote_addr,
|
||||
request.method, request.scheme, request.full_path, response.status)
|
||||
return response
|
||||
|
||||
@ -93,5 +79,5 @@ def exceptions(e):
|
||||
tb = traceback.format_exc()
|
||||
timestamp = time.strftime('[%Y-%b-%d %H:%M]')
|
||||
logger.error('%s %s %s %s %s 5xx INTERNAL SERVER ERROR\n%s', timestamp,
|
||||
get_actual_addr(request), request.method, request.scheme, request.full_path, tb)
|
||||
request.remote_addr, request.method, request.scheme, request.full_path, tb)
|
||||
return e.status_code
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 15 KiB |
@ -7,7 +7,6 @@
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge"/>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1"/>
|
||||
<title>Flask</title>
|
||||
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}"/>
|
||||
<link rel="stylesheet"
|
||||
href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css"/>
|
||||
<link rel="stylesheet"
|
||||
|
@ -7,7 +7,7 @@
|
||||
</ul>
|
||||
</div>
|
||||
<div class="fixed-bottom form-inline">
|
||||
<textarea id="msgbox" class="form-control" style="width:85%; float: left; margin-bottom: 20px;" placeholder="说点什么吧"></textarea>
|
||||
<textarea id="msgbox" class="form-control" style="width:85%; float: left; margin-bottom: 20px;"></textarea>
|
||||
<button id="btn-send"
|
||||
class="btn btn-info"
|
||||
type="button"
|
||||
|
Reference in New Issue
Block a user