diff --git a/rocketmad/models.py b/rocketmad/models.py index 76cdfc261..465b36c0f 100755 --- a/rocketmad/models.py +++ b/rocketmad/models.py @@ -11,13 +11,6 @@ from datetime import datetime, timedelta from flask_sqlalchemy import SQLAlchemy from functools import reduce -from peewee import (Check, SQL, SmallIntegerField, IntegerField, CharField, - DoubleField, BooleanField, DateTimeField, fn, FloatField, - TextField, BigIntegerField, JOIN, OperationalError, - __exception_wrapper__, Model, DatabaseProxy) -from playhouse.flask_utils import FlaskDB -from playhouse.migrate import migrate, MySQLMigrator -from playhouse.pool import PooledMySQLDatabase from sqlalchemy import func, Index, text from sqlalchemy.dialects.mysql import BIGINT, DOUBLE, LONGTEXT, TINYINT from sqlalchemy.orm import Load, load_only diff --git a/rocketmad/utils.py b/rocketmad/utils.py index a67e9a6ef..e06007f02 100644 --- a/rocketmad/utils.py +++ b/rocketmad/utils.py @@ -1061,19 +1061,6 @@ def dynamic_rarity_refresher(app): time.sleep(refresh_time_sec) -# Translate peewee model class attribute to database column name. -def peewee_attr_to_col(cls, field): - field_column = getattr(cls, field) - - # Only try to do it on populated fields. - if field_column is not None: - field_column = field_column.db_column - else: - field_column = field - - return field_column - - def parse_geofence_file(geofence_file): geofences = [] # Read coordinates from file. diff --git a/runhelper.py b/runhelper.py index de332ce5c..ba195a8f8 100644 --- a/runhelper.py +++ b/runhelper.py @@ -73,13 +73,6 @@ def filter(self, record): else: log.setLevel(logging.INFO) - # These are very noisy, let's shush them up a bit. - logging.getLogger('peewee').setLevel(logging.INFO) - - # Turn these back up if debugging. - if args.verbose >= 3: - logging.getLogger('peewee').setLevel(logging.DEBUG) - if __name__ == '__main__': set_log_and_verbosity(log) diff --git a/runserver.py b/runserver.py index 589d02980..038aaad25 100755 --- a/runserver.py +++ b/runserver.py @@ -159,7 +159,6 @@ def filter(self, record): log.setLevel(logging.INFO) # These are very noisy, let's shush them up a bit. - logging.getLogger('peewee').setLevel(logging.INFO) logging.getLogger('requests').setLevel(logging.WARNING) logging.getLogger('werkzeug').setLevel(logging.ERROR) @@ -173,7 +172,6 @@ def filter(self, record): urllib3_logger.setLevel(logging.INFO) if args.verbose >= 3: - logging.getLogger('peewee').setLevel(logging.DEBUG) logging.getLogger('werkzeug').setLevel(logging.DEBUG) logging.addLevelName(5, 'TRACE')