diff options
| author |   Bin Yang <bin.yang@windriver.com> | 2022-03-21 22:40:51 +0800 |
|---|---|---|
| committer | Bin Yang <bin.yang@windriver.com> | 2022-03-22 14:31:13 +0800 |
| commit | de7df2bb51ecd068d3eae6cf314b20c744e96927 (patch) | |
| tree | b55034272a7d683dba1a95c504c6594d970645d3 /starlingx/starlingx | |
| parent | 3bd3e44e2c9533b96f6f6664f9d6ed2150515955 (diff) | |
memcached container as sidecar1.5.7
To fix the dependency on memcached which depends on the GPLv3 licensed gdbm indirectly,
Use sidecar to integrate memcached from dockerhub
Add docker-composer scripts to support local test
Issue-ID: MULTICLOUD-1457
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I55a156c0af158535dccfa87e7b9603e47be4d9c1
Diffstat (limited to 'starlingx/starlingx')
| -rw-r--r-- | starlingx/starlingx/pub/config/log.yml | 9 | ||||
| -rw-r--r-- | starlingx/starlingx/settings.py | 13 |
2 files changed, 19 insertions, 3 deletions
diff --git a/starlingx/starlingx/pub/config/log.yml b/starlingx/starlingx/pub/config/log.yml index ef68a653..d819c233 100644 --- a/starlingx/starlingx/pub/config/log.yml +++ b/starlingx/starlingx/pub/config/log.yml @@ -16,11 +16,11 @@ version: 1 disable_existing_loggers: False loggers: - starlingx: + starlingx_base: handlers: [console_handler, file_handler] level: "DEBUG" propagate: False - starlingx_base: + starlingx: handlers: [console_handler, file_handler] level: "DEBUG" propagate: False @@ -32,6 +32,7 @@ loggers: handlers: [console_handler, file_handler] level: "DEBUG" propagate: False + handlers: console_handler: level: "DEBUG" @@ -44,3 +45,7 @@ handlers: formatter: "standard" maxBytes: 52428800 backupCount: 10 + +formatters: + standard: + format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s" diff --git a/starlingx/starlingx/settings.py b/starlingx/starlingx/settings.py index d5362e4b..c19e8571 100644 --- a/starlingx/starlingx/settings.py +++ b/starlingx/starlingx/settings.py @@ -80,14 +80,25 @@ TIME_ZONE = 'UTC' # https://docs.djangoproject.com/en/1.6/howto/static-files/ STATIC_URL = '/static/' +MEMCACHED_HOST = os.environ.get('MEMCACHED_HOST', '127.0.0.1') +MEMCACHED_PORT = os.environ.get('MEMCACHED_PORT', '11211') +DEFAULT_CACHE_BACKEND_LOCATION = "%s:%s" % (MEMCACHED_HOST, MEMCACHED_PORT) CACHES = { 'default': { 'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache', - 'LOCATION': '127.0.0.1:11211', + 'LOCATION': DEFAULT_CACHE_BACKEND_LOCATION, } } +# [RABBITMQ] +RABBITMQ_DEFAULT_USER = os.environ.get('RABBITMQ_DEFAULT_USER', 'guest') +RABBITMQ_DEFAULT_PASS = os.environ.get('RABBITMQ_DEFAULT_PASS', 'guest') +RABBITMQ_HOST = os.environ.get('RABBITMQ_HOST', 'localhost') +RABBITMQ_PORT = os.environ.get('RABBITMQ_PORT', '5672') +RABBITMQ_URL = "amqp://%s:%s@%s:%s//" % ( + RABBITMQ_DEFAULT_USER, RABBITMQ_DEFAULT_PASS, RABBITMQ_HOST, RABBITMQ_PORT) + # [MSB] DEFAULT_MSB_PROTO = "http" MSB_SERVICE_PROTOCOL = os.environ.get('MSB_PROTO', DEFAULT_MSB_PROTO) |