fix(app): consolidate dict() declarations for settings in base.py

partial part of #50
CitoEngine · Nov 12, 2014 · dfa7156 · dfa7156
1 parent 6ff28e5
commit dfa7156
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 45 deletions.
diff --git a/app/settings/base.py b/app/settings/base.py
@@ -165,6 +165,10 @@
 
 LOGIN_URL = '/login/'
 
+AWS_CONF = dict()
+RABBITMQ_CONF = dict()
+POLLER_CONFIG = dict()
+
 try:
     from .secret_key import *
 except ImportError:

diff --git a/app/settings/dev.py b/app/settings/dev.py
@@ -127,7 +127,6 @@
 ##################################
 # AWS::SQS Configuration settings
 ##################################
-AWS_CONF = dict()
 AWS_CONF['region'] = 'us-east-1'
 AWS_CONF['awskey'] = ''
 AWS_CONF['awssecret'] = ''
@@ -137,7 +136,6 @@
 ##################################
 # RabbitMQ Configuration settings
 ##################################
-RABBITMQ_CONF = dict()
 RABBITMQ_CONF['host'] = 'localhost'
 RABBITMQ_CONF['port'] = 5672
 RABBITMQ_CONF['username'] = 'cito_user'
@@ -157,7 +155,6 @@
 ##############################
 # Event Poller config
 ##############################
-POLLER_CONFIG = dict()
 
 # Polling interval in seconds
 POLLER_CONFIG['interval'] = 5
@@ -169,22 +166,3 @@
 # Leave this to 60 seconds if you don't know what you are doing.
 POLLER_CONFIG['visibility'] = 60
 
-
-########################################
-# Dispatcher config
-# (will be deprecated in future release
-########################################
-DISPATCHER_CONFIG = dict()
-
-# Polling interval
-DISPATCHER_CONFIG['interval'] = 10
-
-# Job lock expire time
-DISPATCHER_CONFIG['lock_expire'] = 30
-
-
-##############################
-# Event Listener config
-##############################
-EVENT_LISTENER_CONFIG = dict()
-EVENT_LISTENER_CONFIG['port'] = 8080
diff --git a/app/settings/production.py b/app/settings/production.py
@@ -126,7 +126,6 @@
 ##################################
 # AWS::SQS Configuration settings
 ##################################
-AWS_CONF = dict()
 AWS_CONF['region'] = 'us-east-1'
 AWS_CONF['awskey'] = ''
 AWS_CONF['awssecret'] = ''
@@ -136,7 +135,6 @@
 ##################################
 # RabbitMQ Configuration settings
 ##################################
-RABBITMQ_CONF = dict()
 RABBITMQ_CONF['host'] = 'localhost'
 RABBITMQ_CONF['port'] = 5672
 RABBITMQ_CONF['username'] = 'cito_user'
@@ -156,7 +154,6 @@
 ##############################
 # Event Poller config
 ##############################
-POLLER_CONFIG = dict()
 
 # Polling interval in seconds
 POLLER_CONFIG['interval'] = 5
@@ -167,23 +164,3 @@
 # How long should the poller hold on the the message before someone else picks it up on
 # Leave this to 60 seconds if you don't know what you are doing.
 POLLER_CONFIG['visibility'] = 60
-
-
-########################################
-# Dispatcher config
-# (will be deprecated in future release
-########################################
-DISPATCHER_CONFIG = dict()
-
-# Polling interval
-DISPATCHER_CONFIG['interval'] = 10
-
-# Job lock expire time
-DISPATCHER_CONFIG['lock_expire'] = 30
-
-
-##############################
-# Event Listener config
-##############################
-EVENT_LISTENER_CONFIG = dict()
-EVENT_LISTENER_CONFIG['port'] = 8080