X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=web_ui.pl;h=52ad371ccd98706e97e2c23d9e3cc9fd66238b0a;hb=7bff12afddfd0c986328cd8202e425967de6b133;hp=1acbc5cd62c7e8ce5fe03cf5f6688241ab7f87ad;hpb=eb7903c1b3d5f8fa35ab7d175aa6063d250afd47;p=APKPM.git

diff --git a/web_ui.pl b/web_ui.pl
index 1acbc5c..52ad371 100755
--- 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';
@@ -181,17 +184,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) ) {
-		foreach my $k ( $redis->keys("$p.*") ) {
-			$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 {
@@ -200,5 +193,8 @@ get '/user' => sub {
 	$self->render('user');
 };
 
+open(my $pid, '>', '/tmp/apkpm.web_ui.pid');
+print $pid "$$\n";
+close $pid;
 
 app->start;