|
|
@@ -4,7 +4,7 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__fil
|
|
|
SECRET_KEY = '$2hf5g$a%_^kk0-l25l$!o5)yc=dvtnfpc8(+$rh4fq4twa_xx'
|
|
|
DEBUG = True
|
|
|
ALLOWED_HOSTS = ["*"]
|
|
|
-
|
|
|
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
|
|
|
INSTALLED_APPS = [
|
|
|
'django.contrib.admin',
|
|
|
'django.contrib.auth',
|
|
|
@@ -22,11 +22,11 @@ MIDDLEWARE = [
|
|
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
|
|
'corsheaders.middleware.CorsMiddleware',
|
|
|
'django.middleware.common.CommonMiddleware',
|
|
|
- 'MiddleWare.requestRecord.RequestRecordMiddleware', # 记录请求信息
|
|
|
# 'django.middleware.csrf.CsrfViewMiddleware',
|
|
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
|
|
'django.contrib.messages.middleware.MessageMiddleware',
|
|
|
'django.middleware.clickjacking.XFrameOptionsMiddleware',
|
|
|
+ 'MiddleWare.requestRecord.RequestRecordMiddleware', # 记录请求信息
|
|
|
]
|
|
|
|
|
|
ROOT_URLCONF = 'AnsjerPush.urls'
|
|
|
@@ -50,26 +50,14 @@ TEMPLATES = [
|
|
|
|
|
|
WSGI_APPLICATION = 'AnsjerPush.wsgi.application'
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-# Database
|
|
|
-# https://docs.djangoproject.com/en/2.1/ref/settings/#databases
|
|
|
-# formal
|
|
|
-# DATABASE_DATA = 'Ansjer81'
|
|
|
-# SERVER_HOST = 'localhost'
|
|
|
-# DATABASES_USER = 'ansjer'
|
|
|
-# DATABASES_PASS = '1234'
|
|
|
-# test
|
|
|
-# DATABASE_DATA = 'AnsjerTest'
|
|
|
-# SERVER_HOST = '13.56.215.252'
|
|
|
-# DATABASES_USER = 'ansjer'
|
|
|
-# DATABASES_PASS = '1234'
|
|
|
-DATABASE_DATA = 'ansjerlocal'
|
|
|
+# 业务数据库
|
|
|
+DATABASE_DATA = 'ansjer'
|
|
|
SERVER_HOST = '127.0.0.1'
|
|
|
DATABASES_USER = 'root'
|
|
|
DATABASES_PASS = '123456'
|
|
|
|
|
|
-DATABASE_DATA2 = 'asjl'
|
|
|
+# 推送数据库
|
|
|
+DATABASE_DATA2 = 'push'
|
|
|
SERVER_HOST2 = '127.0.0.1'
|
|
|
DATABASES_USER2 = 'root'
|
|
|
DATABASES_PASS2 = '123456'
|
|
|
@@ -82,8 +70,12 @@ DATABASES = {
|
|
|
'PASSWORD': DATABASES_PASS,
|
|
|
'HOST': SERVER_HOST,
|
|
|
'PORT': '3306',
|
|
|
- 'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
|
|
|
- 'AUTOCOMMIT': True
|
|
|
+ 'AUTOCOMMIT': True,
|
|
|
+ 'CONN_MAX_AGE': 60,
|
|
|
+ 'OPTIONS': {'charset': 'utf8mb4',
|
|
|
+ 'use_unicode': True,
|
|
|
+ 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
|
|
|
+ }
|
|
|
},
|
|
|
'mysql02': {
|
|
|
'ENGINE': 'django.db.backends.mysql',
|
|
|
@@ -92,8 +84,12 @@ DATABASES = {
|
|
|
'PASSWORD': DATABASES_PASS2,
|
|
|
'HOST': SERVER_HOST2,
|
|
|
'PORT': '3306',
|
|
|
- 'OPTIONS': {'charset': 'utf8mb4', 'use_unicode': True, 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
|
|
|
- 'AUTOCOMMIT': True
|
|
|
+ 'AUTOCOMMIT': True,
|
|
|
+ 'CONN_MAX_AGE': 60,
|
|
|
+ 'OPTIONS': {'charset': 'utf8mb4',
|
|
|
+ 'use_unicode': True,
|
|
|
+ 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
DATABASE_ROUTERS = ['AnsjerPush.database_router.DatabaseAppsRouter']
|
|
|
@@ -102,8 +98,6 @@ DATABASE_APPS_MAPPING = {
|
|
|
'db2': 'mysql02',
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-
|
|
|
# Password validation
|
|
|
# https://docs.djangoproject.com/en/2.1/ref/settings/#auth-password-validators
|
|
|
|
|
|
@@ -169,16 +163,17 @@ CORS_ALLOW_HEADERS = (
|
|
|
'x-requested-with',
|
|
|
)
|
|
|
|
|
|
-
|
|
|
# 日志模块
|
|
|
LOGGING = {
|
|
|
'version': 1,
|
|
|
'disable_existing_loggers': True,
|
|
|
'formatters': {
|
|
|
'error_format': {
|
|
|
- # 'format': '{"asctime":"%(asctime)s","thread":"%(threadName)s:%(thread)d","errorline":"%(lineno)d","errorlevel":"%(levelname)s","errorcontent":"%(message)s"}'
|
|
|
'format': '%(asctime)s %(threadName)s %(thread)d %(lineno)d %(levelname)s %(message)s'
|
|
|
},
|
|
|
+ 'standard': {
|
|
|
+ 'format': '[%(asctime)s] [%(filename)s:%(lineno)d] [%(module)s:%(funcName)s] '
|
|
|
+ '[%(levelname)s]- %(message)s'},
|
|
|
},
|
|
|
'filters': {
|
|
|
},
|
|
|
@@ -191,31 +186,79 @@ LOGGING = {
|
|
|
'default': {
|
|
|
'level': 'ERROR',
|
|
|
'class': 'logging.handlers.RotatingFileHandler',
|
|
|
- 'filename': BASE_DIR + '/static/log/error.log',
|
|
|
+ 'filename': BASE_DIR + '/static/log/error/error.log',
|
|
|
'maxBytes': 1024 * 1024 * 5, # 5 MB
|
|
|
'backupCount': 5,
|
|
|
'formatter': 'error_format',
|
|
|
},
|
|
|
'console': {
|
|
|
- # 'level': 'ERROR',
|
|
|
- 'level': 'DEBUG',
|
|
|
+ 'level': 'ERROR',
|
|
|
'class': 'logging.StreamHandler',
|
|
|
'formatter': 'error_format'
|
|
|
},
|
|
|
+ 'info': {
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'class': 'logging.handlers.RotatingFileHandler',
|
|
|
+ 'filename': BASE_DIR + '/static/log/info/info.log',
|
|
|
+ 'backupCount': 10,
|
|
|
+ 'maxBytes': 1024 * 1024 * 2 * 1024, # 2G
|
|
|
+ 'formatter': 'standard',
|
|
|
+ 'encoding': 'utf-8',
|
|
|
+ },
|
|
|
+ 'time': {
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'class': 'logging.handlers.RotatingFileHandler',
|
|
|
+ 'filename': BASE_DIR + '/static/log/time/info.log',
|
|
|
+ 'backupCount': 10,
|
|
|
+ 'maxBytes': 1024 * 1024 * 2 * 1024, # 2G
|
|
|
+ 'formatter': 'standard',
|
|
|
+ 'encoding': 'utf-8',
|
|
|
+ },
|
|
|
+ 'v1_push': {
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'class': 'logging.handlers.RotatingFileHandler',
|
|
|
+ 'filename': BASE_DIR + '/static/log/v1log/info.log',
|
|
|
+ 'backupCount': 10,
|
|
|
+ 'maxBytes': 1024 * 1024 * 2 * 1024, # 2G
|
|
|
+ 'formatter': 'standard',
|
|
|
+ 'encoding': 'utf-8',
|
|
|
+ },
|
|
|
+ 'customized_push': {
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'class': 'logging.handlers.RotatingFileHandler',
|
|
|
+ 'filename': BASE_DIR + '/static/log/customized_push/info.log',
|
|
|
+ 'backupCount': 10,
|
|
|
+ 'maxBytes': 1024 * 1024 * 2 * 100, # 100M
|
|
|
+ 'formatter': 'standard',
|
|
|
+ 'encoding': 'utf-8',
|
|
|
+ },
|
|
|
},
|
|
|
'loggers': {
|
|
|
'django': {
|
|
|
'handlers': ['default', 'console'],
|
|
|
- # 'handlers': ['mail_admins','default','console'],
|
|
|
- # 'level': 'ERROR',
|
|
|
- 'level': 'DEBUG',
|
|
|
- 'propagate': True
|
|
|
+ 'level': 'ERROR',
|
|
|
+ 'propagate': False
|
|
|
+ },
|
|
|
+ # log 调用时需要当作参数传入
|
|
|
+ 'info': {
|
|
|
+ 'handlers': ['info'],
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'propagate': False
|
|
|
+ },
|
|
|
+ 'time': {
|
|
|
+ 'handlers': ['time'],
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'propagate': False
|
|
|
},
|
|
|
- # 'django.db.backends': {
|
|
|
- # 'handlers': ['console'],
|
|
|
- # 'propagate': True,
|
|
|
- # 'level': 'DEBUG',
|
|
|
- # },
|
|
|
+ 'v1_push': {
|
|
|
+ 'handlers': ['v1_push'],
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'propagate': False
|
|
|
+ },
|
|
|
+ 'customized_push': {
|
|
|
+ 'handlers': ['customized_push'],
|
|
|
+ 'level': 'INFO',
|
|
|
+ 'propagate': False
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
