diff options
Diffstat (limited to 'openstack_dashboard')
| -rw-r--r-- | openstack_dashboard/django_pyscss_fix/__init__.py | 36 | ||||
| -rw-r--r-- | openstack_dashboard/settings.py | 1 | ||||
| -rw-r--r-- | openstack_dashboard/test/settings.py | 1 |
3 files changed, 38 insertions, 0 deletions
diff --git a/openstack_dashboard/django_pyscss_fix/__init__.py b/openstack_dashboard/django_pyscss_fix/__init__.py new file mode 100644 index 000000000..bf35805e9 --- /dev/null +++ b/openstack_dashboard/django_pyscss_fix/__init__.py @@ -0,0 +1,36 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); you may +# not use this file except in compliance with the License. You may obtain +# a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. + +import logging +import os + +from django.conf import settings + +scss_asset_root = os.path.join(settings.STATIC_ROOT, 'scss', 'assets') +LOG = logging.getLogger(__name__) + +""" +This is a workaround for https://bugs.launchpad.net/horizon/+bug/1367590 +It works by creating a path that django_scss will attempt to create +later if it doesn't exist. The django_pyscss code fails +intermittantly because of concurrency issues. This code ignores the +exception and if it was anything other than the concurrency issue +django_pyscss will discover the problem later. + +TODO (doug-fish): remove this workaround once fix for +https://github.com/fusionbox/django-pyscss/issues/23 is picked up. +""" +try: + if not os.path.exists(scss_asset_root): + os.makedirs(scss_asset_root) +except Exception as e: + LOG.info("Error precreating path %s, %s" % (scss_asset_root, e)) diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index 57cf0c12f..311a82b00 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -207,6 +207,7 @@ INSTALLED_APPS = [ 'django.contrib.staticfiles', 'django.contrib.humanize', 'django_pyscss', + 'openstack_dashboard.django_pyscss_fix', 'compressor', 'horizon', 'openstack_auth', diff --git a/openstack_dashboard/test/settings.py b/openstack_dashboard/test/settings.py index 0a581997d..642b59c15 100644 --- a/openstack_dashboard/test/settings.py +++ b/openstack_dashboard/test/settings.py @@ -19,6 +19,7 @@ from openstack_dashboard import exceptions TEST_DIR = os.path.dirname(os.path.abspath(__file__)) ROOT_PATH = os.path.abspath(os.path.join(TEST_DIR, "..")) +STATIC_ROOT = os.path.abspath(os.path.join(ROOT_PATH, '..', 'static')) SECRET_KEY = secret_key.generate_or_read_from_file( os.path.join(TEST_DIR, '.secret_key_store')) |