pass gearman timeout option correctly

[APKPM.git] / web_ui.pl

diff --git a/web_ui.pl b/web_ui.pl
index d3ab984..0331d68 100755 (executable)
--- a/web_ui.pl
+++ b/web_ui.pl
@@ -6,6 +6,9 @@ use Redis;
 use lib '/srv/MojoX-Gearman/lib';
 use MojoX::Gearman;
 
+use lib 'lib';
+use APKPM::Model;
+
 use Data::Dump qw(dump);
 
 plugin 'tag_helpers';
@@ -76,6 +79,39 @@ get '/_g/status' => sub {
        _render_jsonp( $self, Mojo::JSON->new->encode({ status => $status }) );
 };
 
+sub _gearman_redis {
+       my ( $job, $params, $timeout ) = @_;
+
+       my $key = $params;
+       $key =~ s/\W+/_/gs;
+       $key =~ s/\s+/_/gs;
+       $key = "sql.$key";
+       warn "# _gearman_redis $key [$timeout s]";
+
+       my $redis = Redis->new;
+       my $ret;
+
+       if ( $ret = $redis->get($key) ) {
+               warn "redis hit $key\n";
+       } else {
+               $gearman->timeout($timeout);
+               $ret = $gearman->req( 'SUBMIT_JOB', $job, '', $params );
+               die "no result for $params" unless $ret;
+
+               $redis->set($key => $ret);
+       }
+
+       $redis->expire($key => 60); # refresh redis key timeout
+
+       $ret = Mojo::JSON->new->decode( $ret );
+
+       if ( ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY' ) {
+               $ret->{error} = 'query run longer than ' . $gearman->timeout . ' s timeout';
+       }
+
+       return $ret;
+}
+
 get '/gnuplot' => sub {
        my $self = shift;
 
@@ -94,14 +130,7 @@ get '/gnuplot' => sub {
        $sql =~ s/\s+(from|where|order|limit|join)/\n$1/gs;
        $self->param( sql => $sql );
 
-       $gearman->timeout(15);
-       my $ret = $gearman->req( 'SUBMIT_JOB', 'Store_sql', '', $sql );
-       die "no result for $sql" unless $ret;
-
-       $ret = Mojo::JSON->new->decode( $ret );
-       
-       $ret->{error} = 'query run longer than ' . $gearman->timeout . ' s timeout'
-               if ! exists $ret->{error} && ref $ret->{columns} ne 'ARRAY';
+       my $ret = _gearman_redis( 'Store_sql' => $sql, $self->param('timeout') );
 
        return $self->render('gnuplot', sql => $sql, img => '', gnuplot => $ret->{error} )
                if exists $ret->{error};
@@ -181,21 +210,7 @@ set xtics nomirror rotate by -90
 get '/_redis' => sub {
        my $self = shift;
 
-       my $redis = Redis->new;
-
-       my $status;
-       foreach my $p ( qw(poll ZTEDSLAM ZTEMSAN) ) {
-               foreach my $k ( $redis->keys("$p.*") ) {
-                       $status->{$k} = eval { $redis->scard($k) } || $redis->get($k);
-                       if ( $k =~ m/^(ZTE\w+)\.(\d+\.\d+\.\d+\.\d+)\.(\w+)/ ) {
-                               #$status->{$1}->{$2}->{$3} = $status->{$k};
-                               $status->{$1}->{$3} += $status->{$k};
-                       }
-               }
-       }
-
-       warn "## ", dump $status;
-       _render_jsonp( $self, Mojo::JSON->new->encode({ status => $status }) );
+       _render_jsonp( $self, Mojo::JSON->new->encode({ status => APKPM::Model->redis_status }) );
 };
 
 get '/user' => sub {
@@ -204,5 +219,18 @@ get '/user' => sub {
        $self->render('user');
 };
 
+get '/psql/:command' => sub {
+       my $self = shift;
+       my $command = $self->param('command');
+       $command =~ s/^_/\\/ && warn "internal psql command $command";
+       $command = sprintf "psql -c '%s' apkpm", $command;
+       my $output = `$command`; # FIXME unsecure
+       $self->render_text( "\$ <b><tt>$command</tt></b>\n\n<pre>$output</pre>" );
+};
+
+# create pid file
+open(my $pid, '>', '/tmp/apkpm.web_ui.pid');
+print $pid "$$\n";
+close $pid;
 
 app->start;