Merge lp:~terrycojones/tickery/run-from-top-level-800453 into lp:tickery

[Terry Jones]

This is a trivial change to the Twisted plugin so it can be invoked
from the top of our source tree.

[Esteve Fernandez (esteve)]

Does this mean we can run tickery without messing withe PYTHONPATH? i.e. no more PYTHONPATH=.. twistd tickery?

review: Needs Information

[Terry Jones (terrycojones)]

> Does this mean we can run tickery without messing withe PYTHONPATH? i.e. no
> more PYTHONPATH=.. twistd tickery?

Yes.

[Esteve Fernandez (esteve)]

> > Does this mean we can run tickery without messing withe PYTHONPATH? i.e. no
> > more PYTHONPATH=.. twistd tickery?
>
> Yes.

Thanks for your answer! And sorry for the slow reply.

+1 LGTM

review: Approve

[Jamu Kakar (jkakar)]

Nice one, +1!

review: Approve

=== modified file 'twisted/plugins/tickery_service.py'
--- twisted/plugins/tickery_service.py	2011-06-16 16:10:07 +0000
+++ twisted/plugins/tickery_service.py	2011-06-22 00:11:38 +0000
@@ -60,12 +60,12 @@
             int(options['queue-width']), endpoint)
         cache.setServiceParent(tickeryService)
 
-        root = File('www/output')
+        root = File('tickery/www/output')
         root.putChild('tickery', RegularService(cache, endpoint))
         root.putChild(defaults.TICKERY_CALLBACK_CHILD,
                       callback.Callback(cache))
 
-        adminRoot = File('admin/output')
+        adminRoot = File('tickery/admin/output')
         adminRoot.putChild('tickery', AdminService(cache))
         root.putChild('admin', adminRoot)