Revision 1ed37c1d

b/snf-cyclades-app/synnefo/logic/callbacks.py
37 37
import sys
38 38

  
39 39
from synnefo.db.models import VirtualMachine
40
from synnefo.logic import utils, backend, email_send
40
from synnefo.logic import utils, backend
41 41

  
42 42

  
43 43
log = logging.getLogger()
b/snf-cyclades-app/synnefo/logic/dispatcher.py
159 159
    QUEUE_GANETI_EVENTS_OP = "%s-events-op" % prefix
160 160
    QUEUE_GANETI_EVENTS_NET = "%s-events-net" % prefix
161 161
    QUEUE_GANETI_BUILD_PROGR = "%s-events-progress" % prefix
162
    QUEUE_CRON_CREDITS = "%s-credits" % prefix
163 162
    QUEUE_EMAIL = "%s-email" % prefix
164 163
    QUEUE_RECONC = "%s-reconciliation" % prefix
165 164
    if settings.DEBUG is True:
166 165
        QUEUE_DEBUG = "debug"       # Debug queue, retrieves all messages
167 166

  
168 167
    QUEUES = (QUEUE_GANETI_EVENTS_OP, QUEUE_GANETI_EVENTS_NET,
169
              QUEUE_CRON_CREDITS, QUEUE_EMAIL, QUEUE_RECONC,
170
              QUEUE_GANETI_BUILD_PROGR)
168
              QUEUE_EMAIL, QUEUE_RECONC, QUEUE_GANETI_BUILD_PROGR)
171 169

  
172 170
    # notifications of type "ganeti-op-status"
173 171
    DB_HANDLER_KEY_OP = 'ganeti.%s.event.op' % prefix
......
185 183
    (QUEUE_GANETI_EVENTS_OP,  settings.EXCHANGE_GANETI, DB_HANDLER_KEY_OP,      'update_db'),
186 184
    (QUEUE_GANETI_EVENTS_NET, settings.EXCHANGE_GANETI, DB_HANDLER_KEY_NET,     'update_net'),
187 185
    (QUEUE_GANETI_BUILD_PROGR,settings.EXCHANGE_GANETI, BUILD_MONITOR_HANDLER,  'update_build_progress'),
188
    (QUEUE_CRON_CREDITS,      settings.EXCHANGE_CRON,   '*.credits.*',          'update_credits'),
189 186
    (QUEUE_EMAIL,             settings.EXCHANGE_API,    EMAIL_HANDLER,          'send_email'),
190 187
    (QUEUE_EMAIL,             settings.EXCHANGE_CRON,   EMAIL_HANDLER,          'send_email'),
191 188
    (QUEUE_RECONC,            settings.EXCHANGE_CRON,   RECONC_HANDLER,         'trigger_status_update'),

Also available in: Unified diff