Fix keys stats bug + force php-redis version

sasanrose · Nov 16, 2016 · 8149a1e · 8149a1e
1 parent 2555a59
commit 8149a1e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1 +1,2 @@
 logs/
+README.md
diff --git a/Dockerfile b/Dockerfile
@@ -7,6 +7,7 @@ RUN apt-get update && apt-get install -y \
 	gearman-job-server \
 	git-core \
 	libgearman-dev \
+	redis-tools \
 	&& pecl install gearman \
 	&& docker-php-ext-enable gearman
 
@@ -24,7 +25,9 @@ WORKDIR /usr/src
 
 RUN git clone https://github.com/phpredis/phpredis.git
 WORKDIR /usr/src/phpredis
-RUN phpize \
+# Version 3 has a bug with zAdd so checkout to 2.2.8
+RUN git checkout tags/2.2.8 \
+	&& phpize \
 	&& ./configure \
 	&& make \
 	&& make install \

diff --git a/controllers/cron.php b/controllers/cron.php
@@ -27,7 +27,7 @@ public function indexAction()
                 }
 
                 foreach ($this->infoModel->getDbs($info) as $i) {
-                    if (preg_match('/^keys=([0-9]+),expires=([0-9]+)$/', $info["db{$i}"], $matches)) {
+                    if (preg_match('/keys=([0-9]+),expires=([0-9]+)/', $info["db{$i}"], $matches)) {
                         $statsModel->addKey("db{$i}:keys", $matches[1], $time);
                         $statsModel->addKey("db{$i}:expired_keys", $matches[2], $time);
                     }