From 03f5fe61435054167005559b742ea85f4724db0c Mon Sep 17 00:00:00 2001 From: Silas Sewell Date: Tue, 20 Oct 2015 11:45:02 -0400 Subject: [PATCH] workers.storagereplication: error on LocalStorage Ensure we don't start when LocalStorage is in the config. Fixes #502 --- workers/storagereplication.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/workers/storagereplication.py b/workers/storagereplication.py index 9ddb192b7..d888a8926 100644 --- a/workers/storagereplication.py +++ b/workers/storagereplication.py @@ -75,8 +75,21 @@ class StorageReplicationWorker(QueueWorker): if __name__ == "__main__": - if not features.STORAGE_REPLICATION: - logger.debug('Full storage replication disabled; skipping') + logging.config.fileConfig('conf/logging.conf', disable_existing_loggers=False) + + has_local_storage = False + + if features.STORAGE_REPLICATION: + for storage_type, _ in app.config.get('DISTRIBUTED_STORAGE_CONFIG', {}).values(): + if storage_type == 'LocalStorage': + has_local_storage = True + break + + if not features.STORAGE_REPLICATION or has_local_storage: + if has_local_storage: + logger.error("Storage replication can't be used with local storage") + else: + logger.debug('Full storage replication disabled; skipping') while True: time.sleep(10000)