Merge branch 'devel' of h1dev:/srv/APKPM/

diff --git a/web_ui.pl b/web_ui.pl
index 007177e..01b7b98 100755 (executable)
--- a/web_ui.pl
+++ b/web_ui.pl
@@ -24,8 +24,7 @@ get '/ping_http' => sub {
 };
 
 my $gearman = MojoX::Gearman->new; #( ioloop => Mojo::IOLoop->singleton );
-#$gearman->server( 'localhost:4731' );
-$gearman->server( 'localhost:7003' );
+$gearman->server( $ENV{GEARMAN} || 'localhost:4730' );
 
 get '/ping_g' => sub {
        my $self = shift;
@@ -34,11 +33,13 @@ get '/ping_g' => sub {
        $self->render( 'ping', pong => $pong );
 };
 
-get '/g/:call/:args' => sub {
+get '/g/:call/:args' => [ args => qr/.*/ ] => sub {
        my $self = shift;
        my $ret = $gearman->req( 'SUBMIT_JOB', $self->param('call'), '', $self->param('args') );
        warn $self->param('call'), " = ", dump($ret), "\n";
-       $self->render( 'dump', dump => $ret );
+       die "no result for ", $self->param('call'), ' args: ', $self->param('args') unless defined $ret;
+       my $json = Mojo::JSON->new->decode( $ret );
+       $self->render_json( $json );
 };
 app->start;
 __DATA__