From 428c661071566248f30ae744685ce99c783e1cbe Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Fri, 30 Mar 2012 19:24:42 -0400 Subject: [PATCH] made GET / redirect to /static/ --- p2pool/bitcoin/worker_interface.py | 17 +++++++++++------ p2pool/main.py | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/p2pool/bitcoin/worker_interface.py b/p2pool/bitcoin/worker_interface.py index 2b2551d..7bd0f4a 100644 --- a/p2pool/bitcoin/worker_interface.py +++ b/p2pool/bitcoin/worker_interface.py @@ -20,9 +20,9 @@ class _Provider(object): return self.parent._getwork(request, data, long_poll=self.long_poll) class _GETableServer(jsonrpc.Server): - def render_GET(self, request): - request.content = StringIO.StringIO(json.dumps(dict(id=0, method='getwork'))) - return self.render_POST(request) + def __init__(self, provider, render_get_func): + jsonrpc.Server.__init__(self, provider) + self.render_GET = render_get_func class WorkerBridge(object): def __init__(self): @@ -45,9 +45,14 @@ class WorkerInterface(object): self.merkle_root_to_handler = expiring_dict.ExpiringDict(300) - def attach_to(self, res): - res.putChild('', _GETableServer(_Provider(self, long_poll=False))) - res.putChild('long-polling', _GETableServer(_Provider(self, long_poll=True))) + def attach_to(self, res, get_handler=None): + res.putChild('', _GETableServer(_Provider(self, long_poll=False), get_handler)) + + def repost(request): + request.content = StringIO.StringIO(json.dumps(dict(id=0, method='getwork'))) + return s.render_POST(request) + s = _GETableServer(_Provider(self, long_poll=True), repost) + res.putChild('long-polling', s) @defer.inlineCallbacks def _getwork(self, request, data, long_poll): diff --git a/p2pool/main.py b/p2pool/main.py index 6baf22a..3180412 100644 --- a/p2pool/main.py +++ b/p2pool/main.py @@ -693,7 +693,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint): get_current_txouts = lambda: p2pool_data.get_expected_payouts(tracker, current_work.value['best_share_hash'], current_work.value['bits'].target, current_work2.value['subsidy'], net) web_root = web.get_web_root(tracker, current_work, current_work2, get_current_txouts, datadir_path, net, get_stale_counts, my_pubkey_hash, local_rate_monitor, args.worker_fee, p2p_node, my_share_hashes, recent_blocks, pseudoshare_received, share_received) - worker_interface.WorkerInterface(WorkerBridge()).attach_to(web_root) + worker_interface.WorkerInterface(WorkerBridge()).attach_to(web_root, get_handler=lambda request: request.redirect('/static/')) deferral.retry('Error binding to worker port:', traceback=False)(reactor.listenTCP)(worker_endpoint[1], server.Site(web_root), interface=worker_endpoint[0]) @@ -718,7 +718,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint): # done! print 'Started successfully!' - print 'Go to http://127.0.0.1:%i/static to view graphs and statistics.' % (worker_endpoint[1],) + print 'Go to http://127.0.0.1:%i/ to view graphs and statistics!' % (worker_endpoint[1],) if args.donation_percentage > 0.51: print '''Donating %.1f%% of work towards P2Pool's development. Thanks for the tip!''' % (args.donation_percentage,) elif args.donation_percentage < 0.49: -- 1.7.1