Browse Source

[index] Initialize cache before loading to bridge

Previously BridgeAbstract needed to know which exact implementation
of CacheInterface was used (since we only got one right now its
not a problem). Initializing the cache in index.php instead allows
to change cache types more easily.
logmanoriginal 7 years ago
parent
commit
5de4a59d41
2 changed files with 8 additions and 6 deletions
  1. 8 5
      index.php
  2. 0 1
      lib/BridgeAbstract.php

+ 8 - 5
index.php

@@ -117,11 +117,6 @@ try {
 		// Data retrieval
 		$bridge = Bridge::create($bridge);
 
-		$cache = Cache::create('FileCache');
-		$cache->purgeCache();
-
-		$bridge->setCache($cache);
-
 		$noproxy = filter_input(INPUT_GET, '_noproxy', FILTER_VALIDATE_BOOLEAN);
 		if(defined('PROXY_URL') && PROXY_BYBRIDGE && $noproxy){
 			define('NOPROXY',true);
@@ -132,6 +127,14 @@ try {
 		unset($params['bridge']);
 		unset($params['format']);
 		unset($params['_noproxy']);
+
+		// Initialize cache
+		$cache = Cache::create('FileCache');
+		$cache->purgeCache();
+		$cache->setParameters($params);
+
+		// Load cache & data
+		$bridge->setCache($cache);
 		$bridge->setDatas($params);
 
 		// Data transformation

+ 0 - 1
lib/BridgeAbstract.php

@@ -138,7 +138,6 @@ abstract class BridgeAbstract implements BridgeInterface {
 	*/
 	public function setDatas(array $inputs){
 		if(!is_null($this->cache)){
-			$this->cache->setParameters($inputs);
 			$time = $this->cache->getTime();
 			if($time !== false
 			&& (time() - static::CACHE_TIMEOUT < $time)