From c7ecb2bbd450d693726fac4fae2bab3180d527da Mon Sep 17 00:00:00 2001
From: franck cuny <franck@lumberjaph.net>
Date: Sun, 9 May 2010 15:39:40 +0200
Subject: error, check if queue is open before sending job, some small tweak

---
 lib/presque/ControlHandler.pm | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

(limited to 'lib/presque/ControlHandler.pm')

diff --git a/lib/presque/ControlHandler.pm b/lib/presque/ControlHandler.pm
index 4014e2c..b64851d 100644
--- a/lib/presque/ControlHandler.pm
+++ b/lib/presque/ControlHandler.pm
@@ -12,9 +12,8 @@ sub get {
 
     return $self->http_error_queue if !$queue_name;
 
-    my $key = $self->_queue_stat($queue_name);
     $self->application->redis->get(
-        $key,
+        $self->_queue_stat($queue_name),
         sub {
             my $status = shift;
             $self->finish(
@@ -33,7 +32,7 @@ sub post {
 
     return $self->http_error_queue if !$queue_name;
 
-    my $content = JSON::decode_json( $self->request->input );
+    my $content = JSON::decode_json( $self->request->content );
     if ( $content->{status} eq 'start' ) {
         $self->_set_status( $queue_name, 1 );
     }
@@ -41,12 +40,7 @@ sub post {
         $self->_set_status( $queue_name, 0 );
     }
     else {
-        $self->response->code(400);
-        $self->finish(
-            JSON::encode_json(
-                { error => 'invalid status ' . $content->{status} }
-            )
-        );
+        $self->http_error('invalid status '.$content->{status});
     }
 }
 
@@ -61,8 +55,8 @@ sub _set_status {
             my $res = shift;
             $self->finish(
                 JSON::encode_json( {
-                        queue  => $queue_name,
-                        status => $res
+                        queue    => $queue_name,
+                        response => $res
                     }
                 )
             );
-- 
cgit 1.4.1