← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/canonical/launchpad/scripts/runlaunchpad.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-10-04 19:30:31 UTC
  • mfrom: (14098.1.2 longpoll-txlongpoll-0.2.7)
  • Revision ID: launchpad@pqm.canonical.com-20111004193031-k8ak7qgms40rhpi9
[r=allenap][no-qa] Move to txlongpoll 0.2.8 and txlongpollfixture
        0.1.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/canonical/launchpad/scripts/runlaunchpad.py
1
 
# Copyright 2009 Canonical Ltd.  This software is licensed under the
 
1
# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
2
2
# GNU Affero General Public License version 3 (see the file LICENSE).
3
3
 
4
4
# pylint: disable-msg=W0603
247
247
        return config.txlongpoll.launch
248
248
 
249
249
    def launch(self):
250
 
        txlongpoll_bin = os.path.join(config.root, 'bin', 'txlongpoll')
 
250
        twistd_bin = os.path.join(
 
251
            config.root, 'bin', 'twistd-for-txlongpoll')
251
252
        broker_hostname, broker_port = as_host_port(
252
253
            config.rabbitmq.host, None, None)
253
254
        self.server = TxLongPollServer(
254
 
            txlongpoll_bin = txlongpoll_bin,
255
 
            frontend_port = config.txlongpoll.frontend_port,
256
 
            broker_user = config.rabbitmq.userid,
257
 
            broker_password = config.rabbitmq.password,
258
 
            broker_vhost = config.rabbitmq.virtual_host,
259
 
            broker_host = broker_hostname,
260
 
            broker_port = broker_port)
 
255
            twistd_bin=twistd_bin,
 
256
            frontend_port=config.txlongpoll.frontend_port,
 
257
            broker_user=config.rabbitmq.userid,
 
258
            broker_password=config.rabbitmq.password,
 
259
            broker_vhost=config.rabbitmq.virtual_host,
 
260
            broker_host=broker_hostname,
 
261
            broker_port=broker_port)
261
262
        self.useFixture(self.server)
262
263
 
263
264