diff --git a/.gitignore b/.gitignore index 2b480fce..e8a7acaf 100644 --- a/.gitignore +++ b/.gitignore @@ -37,6 +37,7 @@ htmlcov .mr.developer.cfg .project .pydevproject +.idea # Complexity output/*.html diff --git a/gargoyle/manager.py b/gargoyle/manager.py index 96641c62..079b5e9a 100644 --- a/gargoyle/manager.py +++ b/gargoyle/manager.py @@ -170,6 +170,8 @@ def make_gargoyle(): kwargs['remote_timeout'] = settings.GARGOYLE_REMOTE_CACHE_TIMEOUT if hasattr(settings, 'GARGOYLE_MAX_LOCAL_TIMEOUT_JITTER'): kwargs['max_local_timeout_jitter'] = settings.GARGOYLE_MAX_LOCAL_TIMEOUT_JITTER + if hasattr(settings, 'GARGOYLE_LOCAL_CACHE_TIMEOUT'): + kwargs['timeout'] = settings.GARGOYLE_LOCAL_CACHE_TIMEOUT return SwitchManager(Switch, **kwargs)