Restore failed rebase

Author: cytopia

.devilbox/etc/mariadb-10.3/.keepme

@@ -13,8 +13,8 @@
 putenv('RES_OPTIONS=retrans:1 retry:1 timeout:1 attempts:1');
 
 
-$DEVILBOX_VERSION = 'v0.15';
-$DEVILBOX_DATE = '2019-02-27';
+$DEVILBOX_VERSION = 'v1.0.0-alpha1';
+$DEVILBOX_DATE = '2019-02-28';
 $DEVILBOX_API_PAGE = 'devilbox-api/status.json';
 
 //

.devilbox/etc/mariadb-5.5/.keepme

@@ -679,14 +679,14 @@
 											<?php if ($avail_mysql): ?>
 												<tr>
 													<th>mysql</th>
-													<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MYSQL_DATADIR').'/'.loadClass('Helper')->getEnv('MYSQL_SERVER'); ?></td>
+													<td>Docker volume</td>
 													<td>/var/lib/mysql</td>
 												</tr>
 											<?php endif; ?>
 											<?php if ($avail_pgsql): ?>
 												<tr>
 													<th>pgsql</th>
-													<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_PGSQL_DATADIR').'/'.loadClass('Helper')->getEnv('PGSQL_SERVER'); ?></td>
+													<td>Docker volume</td>
 													<td>/var/lib/postgresql/data/pgdata</td>
 												</tr>
 											<?php endif; ?>
@@ -707,7 +707,7 @@
 											<?php if ($avail_mongo): ?>
 												<tr>
 													<th>mongo</th>
-													<td><?php echo loadClass('Helper')->getEnv('HOST_PATH_MONGO_DATADIR'); ?></td>
+													<td>Docker volume</td>
 													<td>/data/db</td>
 												</tr>
 											<?php endif; ?>

.devilbox/etc/mysql-5.5/.keepme

@@ -114,8 +114,25 @@ public function getKeys()
 		// Memcached >= 1.5
 		for ($i=0; $i<$cli_retries; $i++) {
 
+			// Get item number to trigger with stats cachedump
 			$output = array();
-			exec('printf "stats cachedump 1 0\nquit\n" | nc memcd 11211 | grep -E \'^ITEM\'', $output);
+			exec('printf "stats items\nquit\n" | nc memcd 11211 | grep -E \'items:[0-9]+:number\s[0-9]+\'', $output);
+			$num1 = 1;
+			$num2 = 0;
+			if (isset($output[0])) {
+				$matches = array();
+				preg_match('/items:([0-9]+):number\s([0-9]+)/', $output[0], $matches);
+				if (isset($matches[1])) {
+					$num1 = $matches[1];
+				}
+				if (isset($matches[2])) {
+					$num2 = $matches[2];
+				}
+			}
+
+			// Trigger stats cachedump on item number
+			$output = array();
+			exec('printf "stats cachedump '.$num1.' '.$num2.' \nquit\n" | nc memcd 11211 | grep -E \'^ITEM\'', $output);
 			foreach ($output as $line) {
 				$matches = array();
 				preg_match('/(^ITEM)\s*(.+?)\s*\[([0-9]+\s*b);\s*([0-9]+\s*s)\s*\]/', $line, $matches);