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

[APKPM.git] / lib / APKPM / Model.pm

diff --git a/lib/APKPM/Model.pm b/lib/APKPM/Model.pm
index 0fce41b..a8ab00c 100644 (file)
--- a/lib/APKPM/Model.pm
+++ b/lib/APKPM/Model.pm
@@ -8,16 +8,20 @@ sub redis_status {
        my $redis = Redis->new;
 
        my $status;
-       foreach my $p ( qw(poll ZTEDSLAM ZTEMSAN) ) {
+       foreach my $p ( qw(ZTEDSLAM ZTEMSAN CPE) ) {
                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->{poll}->{$1}->{$3} += $status->{$k};
+                       } elsif ( $k =~ m/^CPE\.(.+)/ ) {
+                               $status->{poll}->{CPE}->{$1} = $status->{$k};
                        }
                }
        }
 
+       $status->{info} = $redis->info;
+
        return $status;
 }