From b764b9b4cf91a683d03111ff732623ba24c4116d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Andr=C3=A9s=20Rocha?= Date: Mon, 21 Oct 2013 03:19:22 -0400 Subject: [PATCH] Fix error when reading tokens on aws configuration The error was caused by the CONFIG_ROOT environmental variable, which was incorrectly assumed to be a path.py valid path. --- cms/envs/aws.py | 3 ++- lms/envs/aws.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cms/envs/aws.py b/cms/envs/aws.py index 9f6d5031ea..c7b107a939 100644 --- a/cms/envs/aws.py +++ b/cms/envs/aws.py @@ -12,6 +12,7 @@ from .common import * from logsettings import get_logger_config import os +from path import path # SERVICE_VARIANT specifies name of the variant used, which decides what JSON # configuration files are read during startup. @@ -20,7 +21,7 @@ SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None) # CONFIG_ROOT specifies the directory where the JSON configuration # files are expected to be found. If not specified, use the project # directory. -CONFIG_ROOT = os.environ.get('CONFIG_ROOT', ENV_ROOT) +CONFIG_ROOT = path(os.environ.get('CONFIG_ROOT', ENV_ROOT)) # CONFIG_PREFIX specifies the prefix of the JSON configuration files, # based on the service variant. If no variant is use, don't use a diff --git a/lms/envs/aws.py b/lms/envs/aws.py index ee56c6490a..fea5880c25 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -17,6 +17,7 @@ from .common import * from logsettings import get_logger_config import os +from path import path # SERVICE_VARIANT specifies name of the variant used, which decides what JSON # configuration files are read during startup. @@ -25,7 +26,7 @@ SERVICE_VARIANT = os.environ.get('SERVICE_VARIANT', None) # CONFIG_ROOT specifies the directory where the JSON configuration # files are expected to be found. If not specified, use the project # directory. -CONFIG_ROOT = os.environ.get('CONFIG_ROOT', ENV_ROOT) +CONFIG_ROOT = path(os.environ.get('CONFIG_ROOT', ENV_ROOT)) # CONFIG_PREFIX specifies the prefix of the JSON configuration files, # based on the service variant. If no variant is use, don't use a