Skip to content

P
physical
Commit e9155030 authored by 钟尚武's avatar 钟尚武
Browse files
Options

Merge branch 'refactor' into 'master' 

fix settings_local

See merge request !589
parents f5ab5eed 56f02a98
Pipeline #4809 passed with stage
    Show whitespace changes
    Inline Side-by-side
    Showing with 96 additions and 0 deletions
    deploy/prod/settings_local.py
    View file @ e9155030
    ......@@ -211,3 +211,50 @@ KAFKA_TOPIC_NAME = "gm-maidian-data"
    KAFKA_GM_LOGGING_TOPIC_NAME = "gm-logging-prod"
    SLAVE_DB_NAME = 'slave'
    SLAVE1_DB_NAME = 'slave1'
    SLAVE2_DB_NAME = 'slave2'
    MASTER_DB_NAME = 'master'
    ES_INDEX_PREFIX = "gm-dbmw"
    MIDDLEWARE_CLASSES = (
    'gm_tracer.middleware.TracerMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'helios.DjangoL5dMiddleware',
    )
    # Password validation
    # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
    # Internationalization
    # https://docs.djangoproject.com/en/1.10/topics/i18n/
    # LANGUAGE_CODE = 'en-us'
    #
    TIME_ZONE = 'Asia/Shanghai'
    USE_I18N = True
    USE_L10N = True
    #
    # USE_TZ = True
    # Static files (CSS, JavaScript, Images)
    # https://docs.djangoproject.com/en/1.10/howto/static-files/
    STATIC_URL = '/static/'
    CACHE_SECONDS = 60 * 60 * 24 * 2
    REDIS_HOST = '172.17.40.140'
    REDIS_PW = 'gHtmeIqBhVHtH8MG'
    REDIS_TOPIC = {
    'reply_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 9, 'password': REDIS_PW},
    'follow_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 10, 'password': REDIS_PW},
    'click_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 11, 'password': REDIS_PW},
    }
    \ No newline at end of file
    deploy/stage/settings_local.py
    View file @ e9155030
    ......@@ -211,3 +211,50 @@ KAFKA_TOPIC_NAME = "gm-maidian-data"
    KAFKA_GM_LOGGING_TOPIC_NAME = "gm-logging-prod"
    SLAVE_DB_NAME = 'slave'
    SLAVE1_DB_NAME = 'slave1'
    SLAVE2_DB_NAME = 'slave2'
    MASTER_DB_NAME = 'master'
    ES_INDEX_PREFIX = "gm-dbmw"
    MIDDLEWARE_CLASSES = (
    'gm_tracer.middleware.TracerMiddleware',
    'django.contrib.sessions.middleware.SessionMiddleware',
    'django.middleware.common.CommonMiddleware',
    'django.middleware.csrf.CsrfViewMiddleware',
    'django.contrib.auth.middleware.AuthenticationMiddleware',
    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
    'django.contrib.messages.middleware.MessageMiddleware',
    'django.middleware.clickjacking.XFrameOptionsMiddleware',
    'helios.DjangoL5dMiddleware',
    )
    # Password validation
    # https://docs.djangoproject.com/en/1.10/ref/settings/#auth-password-validators
    # Internationalization
    # https://docs.djangoproject.com/en/1.10/topics/i18n/
    # LANGUAGE_CODE = 'en-us'
    #
    TIME_ZONE = 'Asia/Shanghai'
    USE_I18N = True
    USE_L10N = True
    #
    # USE_TZ = True
    # Static files (CSS, JavaScript, Images)
    # https://docs.djangoproject.com/en/1.10/howto/static-files/
    STATIC_URL = '/static/'
    CACHE_SECONDS = 60 * 60 * 24 * 2
    REDIS_HOST = '172.17.40.140'
    REDIS_PW = 'gHtmeIqBhVHtH8MG'
    REDIS_TOPIC = {
    'reply_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 9, 'password': REDIS_PW},
    'follow_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 10, 'password': REDIS_PW},
    'click_cache': {'host': REDIS_HOST, 'port': 6379, 'db': 11, 'password': REDIS_PW},
    }
    \ No newline at end of file
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment