diff --git a/cvat/settings/base.py b/cvat/settings/base.py index 4edb25dd..ba4587dd 100644 --- a/cvat/settings/base.py +++ b/cvat/settings/base.py @@ -339,6 +339,7 @@ STATIC_URL = '/static/' STATIC_ROOT = os.path.join(BASE_DIR, 'static') os.makedirs(STATIC_ROOT, exist_ok=True) +# Make sure to update other config files when upading these directories DATA_ROOT = os.path.join(BASE_DIR, 'data') LOGSTASH_DB = os.path.join(DATA_ROOT,'logstash.db') os.makedirs(DATA_ROOT, exist_ok=True) diff --git a/cvat/settings/testing.py b/cvat/settings/testing.py index 992ba866..b8659aa4 100644 --- a/cvat/settings/testing.py +++ b/cvat/settings/testing.py @@ -11,23 +11,40 @@ BASE_DIR = _temp_dir.name DATA_ROOT = os.path.join(BASE_DIR, 'data') os.makedirs(DATA_ROOT, exist_ok=True) -SHARE_ROOT = os.path.join(BASE_DIR, 'share') -os.makedirs(SHARE_ROOT, exist_ok=True) +LOGSTASH_DB = os.path.join(DATA_ROOT,'logstash.db') +os.makedirs(DATA_ROOT, exist_ok=True) +if not os.path.exists(LOGSTASH_DB): + open(LOGSTASH_DB, 'w').close() MEDIA_DATA_ROOT = os.path.join(DATA_ROOT, 'data') os.makedirs(MEDIA_DATA_ROOT, exist_ok=True) +CACHE_ROOT = os.path.join(DATA_ROOT, 'cache') +os.makedirs(CACHE_ROOT, exist_ok=True) + TASKS_ROOT = os.path.join(DATA_ROOT, 'tasks') os.makedirs(TASKS_ROOT, exist_ok=True) PROJECTS_ROOT = os.path.join(DATA_ROOT, 'projects') os.makedirs(PROJECTS_ROOT, exist_ok=True) +SHARE_ROOT = os.path.join(BASE_DIR, 'share') +os.makedirs(SHARE_ROOT, exist_ok=True) + MODELS_ROOT = os.path.join(DATA_ROOT, 'models') os.makedirs(MODELS_ROOT, exist_ok=True) -CACHE_ROOT = os.path.join(DATA_ROOT, 'cache') -os.makedirs(CACHE_ROOT, exist_ok=True) +LOGS_ROOT = os.path.join(BASE_DIR, 'logs') +os.makedirs(LOGS_ROOT, exist_ok=True) + +MIGRATIONS_LOGS_ROOT = os.path.join(LOGS_ROOT, 'migrations') +os.makedirs(MIGRATIONS_LOGS_ROOT, exist_ok=True) + +CLOUD_STORAGE_ROOT = os.path.join(DATA_ROOT, 'storages') +os.makedirs(CLOUD_STORAGE_ROOT, exist_ok=True) + +TMP_FILES_ROOT = os.path.join(DATA_ROOT, 'tmp') +os.makedirs(TMP_FILES_ROOT, exist_ok=True) # To avoid ERROR django.security.SuspiciousFileOperation: # The joined path (...) is located outside of the base path component