From f2d8737789d522570ea58896826c91571a254bb0 Mon Sep 17 00:00:00 2001 From: franck cuny Date: Sun, 9 May 2010 11:12:07 +0200 Subject: use presque::r::qn --- lib/presque/ControlHandler.pm | 18 +++++++++++++----- lib/presque/JobQueueHandler.pm | 4 +++- lib/presque/StatusHandler.pm | 6 +++--- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/presque/ControlHandler.pm b/lib/presque/ControlHandler.pm index f900ea9..02136d1 100644 --- a/lib/presque/ControlHandler.pm +++ b/lib/presque/ControlHandler.pm @@ -2,6 +2,8 @@ package presque::ControlHandler; use Moose; extends 'Tatsumaki::Handler'; +with qw/presque::Role::QueueName/; + __PACKAGE__->asynchronous(1); before [qw/get post/] => sub { @@ -18,14 +20,16 @@ sub get { return; } - my $key = 'queuestat:' . $queue_name; + my $key = $self->_queue_stat($queue_name); $self->application->redis->get( $key, sub { my $status = shift; $self->finish( - JSON::encode_json( - { queue => $queue_name, status => $status } + JSON::encode_json( { + queue => $queue_name, + status => $status + } ) ); } @@ -60,14 +64,18 @@ sub post { sub _set_status { my ( $self, $queue_name, $status ) = @_; - my $key = 'queuestat:' . $queue_name; + my $key = $self->_queue_stat($queue_name); $self->application->redis->set( $key, 0, sub { my $res = shift; $self->finish( - JSON::encode_json( { queue => $queue_name, status => $res } ) + JSON::encode_json( { + queue => $queue_name, + status => $res + } + ) ); } ); diff --git a/lib/presque/JobQueueHandler.pm b/lib/presque/JobQueueHandler.pm index 65867e3..b6a7b44 100644 --- a/lib/presque/JobQueueHandler.pm +++ b/lib/presque/JobQueueHandler.pm @@ -2,6 +2,8 @@ package presque::JobQueueHandler; use Moose; extends 'Tatsumaki::Handler'; +with qw/presque::Role::QueueName/; + __PACKAGE__->asynchronous(1); before [qw/get/] => sub { @@ -18,7 +20,7 @@ sub get { return; } - my $key = $queue_name . ':queue'; + my $key = $self->_queue($queue_name); $self->application->redis->lrange( $key, 0, 9, diff --git a/lib/presque/StatusHandler.pm b/lib/presque/StatusHandler.pm index 18be7cd..84a75de 100644 --- a/lib/presque/StatusHandler.pm +++ b/lib/presque/StatusHandler.pm @@ -2,6 +2,8 @@ package presque::StatusHandler; use Moose; extends 'Tatsumaki::Handler'; +with qw/presque::Role::QueueName/; + __PACKAGE__->asynchronous(1); use JSON; @@ -14,13 +16,11 @@ before [qw/get/] => sub { sub get { my ( $self, $queue_name ) = @_; - $self->response->header( 'Content-Type' => 'application/json' ); - my $conf = $self->application->config->{redis}; my $stats = { redis => $conf->{host} . ':' . $conf->{port}, }; if ($queue_name) { - my $key = $queue_name . ":queue"; + my $key = $self->_queue($queue_name); $self->application->redis->llen( $key, sub { -- cgit v1.2.3