← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

Viewing changes to nova/openstack/common/rpc/impl_qpid.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
Import upstream version 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/openstack/common/rpc/impl_qpid.py
17
17
 
18
18
import functools
19
19
import itertools
20
 
import json
21
20
import logging
22
21
import time
23
22
import uuid
29
28
 
30
29
from nova.openstack.common import cfg
31
30
from nova.openstack.common.gettextutils import _
 
31
from nova.openstack.common import jsonutils
32
32
from nova.openstack.common.rpc import amqp as rpc_amqp
33
33
from nova.openstack.common.rpc import common as rpc_common
34
34
 
125
125
        addr_opts["node"]["x-declare"].update(node_opts)
126
126
        addr_opts["link"]["x-declare"].update(link_opts)
127
127
 
128
 
        self.address = "%s ; %s" % (node_name, json.dumps(addr_opts))
 
128
        self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
129
129
 
130
130
        self.reconnect(session)
131
131
 
230
230
        if node_opts:
231
231
            addr_opts["node"]["x-declare"].update(node_opts)
232
232
 
233
 
        self.address = "%s ; %s" % (node_name, json.dumps(addr_opts))
 
233
        self.address = "%s ; %s" % (node_name, jsonutils.dumps(addr_opts))
234
234
 
235
235
        self.reconnect(session)
236
236
 
329
329
        if self.conf.qpid_reconnect_interval:
330
330
            self.connection.reconnect_interval = (
331
331
                self.conf.qpid_reconnect_interval)
332
 
        self.connection.hearbeat = self.conf.qpid_heartbeat
 
332
        self.connection.heartbeat = self.conf.qpid_heartbeat
333
333
        self.connection.protocol = self.conf.qpid_protocol
334
334
        self.connection.tcp_nodelay = self.conf.qpid_tcp_nodelay
335
335