tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-27 07:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Web\JavaScript: use Cache and ETags

Browse Source 
refs #6927
This commit is contained in:
Thomas Gelf 2014-09-02 16:25:44 +02:00
parent f0d6cf994e
commit e4687a60f9
1 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
library/Icinga/Web/JavaScript.php
View File

@ -5,6 +5,7 @@
namespace Icinga\Web; namespace Icinga\Web;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Web\FileCache;
use JShrink\Minifier; use JShrink\Minifier;
class JavaScript class JavaScript
@ -62,36 +63,58 @@ class JavaScript
$js = $out = ''; $js = $out = '';
$min = $minified ? '.min' : ''; $min = $minified ? '.min' : '';
// TODO: Cache header // Prepare vendor file list
header('Content-Type: application/javascript'); $vendorFiles = array();
$cacheFile = '/tmp/cache_icinga' . $min . '.js';
if (file_exists($cacheFile)) {
readfile($cacheFile);
exit;
}
// We do not minify vendor files
foreach (self::$vendorFiles as $file) { foreach (self::$vendorFiles as $file) {
$out .= file_get_contents($basedir . '/' . $file . $min . '.js'); $vendorFiles[] = $basedir . '/' . $file . $min . '.js';
} }
// Prepare Icinga JS file list
$jsFiles = array();
foreach (self::$jsFiles as $file) { foreach (self::$jsFiles as $file) {
$js .= file_get_contents($basedir . '/' . $file); $jsFiles[] = $basedir . '/' . $file;
} }
foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) { foreach (Icinga::app()->getModuleManager()->getLoadedModules() as $name => $module) {
if ($module->hasJs()) { if ($module->hasJs()) {
$js .= file_get_contents($module->getJsFilename()); $jsFiles[] = $module->getJsFilename();
} }
} }
$files = array_merge($vendorFiles, $jsFiles);
if ($etag = FileCache::etagMatchesFiles($files)) {
header("HTTP/1.1 304 Not Modified");
return;
} else {
$etag = FileCache::etagForFiles($files);
}
header('Cache-Control: public');
header('ETag: "' . $etag . '"');
header('Content-Type: application/javascript');
$cacheFile = 'icinga-' . $etag . $min . '.js';
$cache = FileCache::instance();
if ($cache->has($cacheFile)) {
$cache->send($cacheFile);
return;
}
// We do not minify vendor files
foreach ($vendorFiles as $file) {
$out .= file_get_contents($file);
}
foreach ($jsFiles as $file) {
$js .= file_get_contents($file);
}
if ($minified) { if ($minified) {
require_once 'IcingaVendor/JShrink/Minifier.php'; require_once 'IcingaVendor/JShrink/Minifier.php';
$out .= Minifier::minify($js, array('flaggedComments' => false)); $out .= Minifier::minify($js, array('flaggedComments' => false));
} else { } else {
$out .= $js; $out .= $js;
} }
// Not yet, this is for tests only. Waiting for Icinga\Web\Cache $cache->store($cacheFile, $out);
// file_put_contents($cacheFile, $out);
echo $out; echo $out;
} }
} }