launchpad-reviewers team mailing list archive

[Raphaël Badin <raphael.badin@xxxxxxxxxxxxx>]

Raphaël Badin has proposed merging lp:~rvb/maas/maas-longpoll into lp:maas.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~rvb/maas/maas-longpoll/+merge/96727

This branch adds a longpoll service to maas.  Use and password are harcoded now (bin/twistd.longpoll --pidfile=$@ txlongpoll -u guest -a guest -f 4545) but once txlongpoll will support taking a configuration file we will switch to using that instead.
-- 
https://code.launchpad.net/~rvb/maas/maas-longpoll/+merge/96727
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~rvb/maas/maas-longpoll into lp:maas.

=== modified file '.bzrignore'
--- .bzrignore	2012-02-20 11:02:48 +0000
+++ .bzrignore	2012-03-09 17:11:21 +0000
@@ -13,6 +13,7 @@
 ./download-cache
 ./eggs
 ./logs
+./longpoll.pid
 ./parts
 ./pserv.log
 ./pserv.pid
@@ -20,3 +21,4 @@
 ./tags
 ./twistd.log
 ./twisted/plugins/dropin.cache
+./txlongpoll.log

=== modified file 'Makefile'
--- Makefile	2012-02-15 17:13:37 +0000
+++ Makefile	2012-03-09 17:11:21 +0000
@@ -4,6 +4,7 @@
     bin/buildout \
     bin/maas bin/test.maas \
     bin/twistd.pserv bin/test.pserv \
+    bin/twistd.longpoll \
     bin/py bin/ipy
 
 all: build doc
@@ -28,6 +29,10 @@
 	bin/buildout install pserv-test
 	@touch --no-create $@
 
+bin/twistd.longpoll: bin/buildout buildout.cfg setup.py
+	bin/buildout install longpoll
+	@touch --no-create $@
+
 bin/flake8: bin/buildout buildout.cfg setup.py
 	bin/buildout install flake8
 	@touch --no-create $@
@@ -67,7 +72,7 @@
 	find . -type f -name '*.py[co]' -print0 | xargs -r0 $(RM)
 	find . -type f -name '*~' -print0 | xargs -r0 $(RM)
 
-distclean: clean pserv-stop
+distclean: clean pserv-stop longpoll-stop
 	utilities/maasdb delete-cluster ./db/
 	$(RM) -r eggs develop-eggs
 	$(RM) -r bin build dist logs parts
@@ -84,7 +89,15 @@
 pserv-stop:
 	{ test -e pserv.pid && cat pserv.pid; } | xargs --no-run-if-empty kill
 
-run: bin/maas dev-db pserv.pid
+longpoll.pid: bin/twistd.longpoll
+	bin/twistd.longpoll --pidfile=$@ txlongpoll -u guest -a guest -f 4545
+
+longpoll-start: longpoll.pid
+
+longpoll-stop:
+	{ test -e longpoll.pid && cat longpoll.pid; } | xargs --no-run-if-empty kill
+
+run: bin/maas dev-db pserv.pid longpoll.pid
 	bin/maas runserver 8000 --settings=maas.demo
 
 harness: bin/maas dev-db
@@ -96,4 +109,5 @@
 .PHONY: \
     build check clean dev-db distclean doc \
     harness lint pserv-start pserv-stop run \
+    longpoll-start longpoll-stop \
     syncdb test sampledata

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-03-08 16:50:03 +0000
+++ buildout.cfg	2012-03-09 17:11:21 +0000
@@ -7,6 +7,7 @@
   pserv-test
   repl
   sphinx
+  longpoll
 extensions = buildout-versions
 buildout_versions_file = versions.cfg
 versions = versions
@@ -156,3 +157,16 @@
 extra-paths = ${common:extra-paths}
 interpreter = py
 scripts = ipython=ipy
+
+[longpoll]
+recipe = z3c.recipe.scripts
+eggs =
+  txlongpoll
+  oops-datedir-repo
+  oops-twisted
+  pyyaml
+  twisted
+  txamqp
+entry-points = twistd.longpoll=twisted.scripts.twistd:run
+scripts = twistd.longpoll
+

=== modified file 'versions.cfg'
--- versions.cfg	2012-03-09 13:00:59 +0000
+++ versions.cfg	2012-03-09 17:11:21 +0000
@@ -42,6 +42,13 @@
 # Bug 251 is problematic in 0.9.2.
 django-debug-toolbar = 0.9.1
 
+# Longpoll stuff.
+txlongpoll = 0.2.12
+setproctitle = 1.1.3
+oops-amqp = 0.0.6
+pymongo = 2.1.1
+
+
 [versions-auto]
 # Added by Buildout Versions at 2012-02-24 15:51:04.865203
 buildout-versions = 1.7