dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- added new housekeeping cronjob für cached files, closed #200

Browse Source 
- added new cache size information to /setup page
This commit is contained in:
Exodus4D
2016-06-25 20:51:55 +02:00
parent 029e8cee67
commit e16b507ef0
9 changed files with 202 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/main/controller/setup.php
View File

@@ -8,6 +8,7 @@
namespace Controller;
use data\filesystem\Search;
use DB;
use DB\SQL;
use DB\SQL\MySQL as MySQL;
@@ -174,7 +175,7 @@ class Setup extends Controller {
$f3->set('checkDatabase', $this->checkDatabase($f3, $fixColumns));
// set cache size
$f3->set('cacheSize', $this->getCacheSize($f3));
$f3->set('cacheSize', $this->getCacheData($f3));
}
/**
@@ -229,7 +230,7 @@ class Setup extends Controller {
$serverInfo = [
'time' => [
'label' => 'Time',
'value' => date('Y/m/d H:i:s') . ' - (' . date_default_timezone_get() . ')'
'value' => date('Y/m/d H:i:s') . ' - (' . $f3->get('TZ') . ')'
],
'os' => [
'label' => 'OS',
@@ -746,12 +747,29 @@ class Setup extends Controller {
/**
* get cache folder size as string
* @param \Base $f3
* @return string
* @return array
*/
protected function getCacheSize(\Base $f3){
$dir = $f3->get('TEMP') . '/cache';
$bytes = $this->folderSize($dir);
return $this->convertBytes($bytes);
protected function getCacheData(\Base $f3){
// get all cache -----------------------------------------------------------------------------------------
$cacheFilesAll = Search::getFilesByMTime( $f3->get('TEMP') );
$bytesAll = 0;
foreach($cacheFilesAll as $filename => $file) {
$bytesAll += $file->getSize();
}
// get data cache -----------------------------------------------------------------------------------------
$cacheFilesData = Search::getFilesByMTime( $f3->get('TEMP') . 'cache/' );
$bytesData = 0;
foreach($cacheFilesData as $filename => $file) {
$bytesData += $file->getSize();
}
return [
'all' => $this->convertBytes($bytesAll),
'data' => $this->convertBytes($bytesData),
'template' => $this->convertBytes($bytesAll - $bytesData)
];
}
/**
@@ -762,19 +780,6 @@ class Setup extends Controller {
$f3->clear('CACHE');
}
/**
* get folder size in bytes (recursive)
* @param string $dir
* @return int
*/
protected function folderSize($dir){
$size = 0;
foreach (glob(rtrim($dir, '/').'/*', GLOB_NOSORT) as $each) {
$size += is_file($each) ? filesize($each) : $this->folderSize($each);
}
return $size;
}
/**
* convert Bytes to string + suffix
* @param int $bytes