modify schema for new CPE stats

[APKPM.git] / web_ui.pl

diff --git a/web_ui.pl b/web_ui.pl
index 22d4455..52ad371 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';
@@ -29,6 +32,7 @@ get '/ping_http' => sub {
 
 my $gearman = MojoX::Gearman->new; #( ioloop => Mojo::IOLoop->singleton );
 $gearman->server( $ENV{GEARMAN} || 'localhost:4730' );
+$gearman->timeout( 15 );
 
 get '/ping_g' => sub {
        my $self = shift;
@@ -93,6 +97,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;
 
@@ -179,15 +184,7 @@ set xtics nomirror rotate by -90
 get '/_redis' => sub {
        my $self = shift;
 
-       my $redis = Redis->new;
-
-       my $status;
-       foreach my $k ( $redis->keys('poll.*') ) {
-               $status->{$k} = eval { $redis->scard($k) } || $redis->get($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 {
@@ -196,5 +193,8 @@ get '/user' => sub {
        $self->render('user');
 };
 
+open(my $pid, '>', '/tmp/apkpm.web_ui.pid');
+print $pid "$$\n";
+close $pid;
 
 app->start;