format code

oj/local_settings.py

@@ -7,11 +7,6 @@ DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
         'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-    },
-    # submission 的 name 和 engine 请勿修改，其他代码会用到
-    'submission': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db1.sqlite3'),
     }
 }
 
@@ -33,3 +28,4 @@ ALLOWED_HOSTS = ["*"]
 
 TEST_CASE_DIR = "/tmp"
 
+LOG_PATH = "log/"

oj/server_settings.py

@@ -12,15 +12,6 @@ DATABASES = {
         'PORT': 3306,
         'USER': os.environ["MYSQL_ENV_MYSQL_USER"],
         'PASSWORD': os.environ["MYSQL_ENV_MYSQL_ROOT_PASSWORD"]
-    },
-    'submission': {
-        'NAME': 'oj_submission',
-        'ENGINE': 'django.db.backends.mysql',
-        'CONN_MAX_AGE': 0.1,
-        'HOST': os.environ["MYSQL_PORT_3306_TCP_ADDR"],
-        'PORT': 3306,
-        'USER': os.environ["MYSQL_ENV_MYSQL_USER"],
-        'PASSWORD': os.environ["MYSQL_ENV_MYSQL_ROOT_PASSWORD"]
     }
 }
 
@@ -43,3 +34,4 @@ ALLOWED_HOSTS = ['*']
 
 TEST_CASE_DIR = "/test_case"
 
+LOG_PATH = "log/"

oj/settings.py

@@ -104,8 +104,6 @@ STATIC_URL = '/static/'
 
 AUTH_USER_MODEL = 'account.User'
 
-LOG_PATH = "log/"
-
 LOGGING = {
     'version': 1,
     'disable_existing_loggers': True,
@@ -118,13 +116,13 @@ LOGGING = {
         'django_error': {
             'level': 'DEBUG',
             'class': 'logging.handlers.RotatingFileHandler',
-            'filename': LOG_PATH + 'django.log',
+            'filename': os.path.join(LOG_PATH, 'django.log'),
             'formatter': 'standard'
         },
         'app_info': {
             'level': 'DEBUG',
             'class': 'logging.handlers.RotatingFileHandler',
-            'filename': LOG_PATH + 'app_info.log',
+            'filename': os.path.join(LOG_PATH, 'app_info.log'),
             'formatter': 'standard'
         },
         'console': {
@@ -152,17 +150,13 @@ LOGGING = {
     },
 }
 
-if DEBUG:
-    REST_FRAMEWORK = {
-        'TEST_REQUEST_DEFAULT_FORMAT': 'json'
-    }
-else:
-    REST_FRAMEWORK = {
-        'TEST_REQUEST_DEFAULT_FORMAT': 'json',
-        'DEFAULT_RENDERER_CLASSES': (
-            'rest_framework.renderers.JSONRenderer',
-        )
-    }
+
+REST_FRAMEWORK = {
+    'TEST_REQUEST_DEFAULT_FORMAT': 'json',
+    'DEFAULT_RENDERER_CLASSES': (
+        'rest_framework.renderers.JSONRenderer',
+    )
+}
 
 # for celery
 BROKER_URL = 'redis://%s:%s/%s' % (REDIS_QUEUE["host"], str(REDIS_QUEUE["port"]), str(REDIS_QUEUE["db"]))