Fix cache image

app/private/lib/gui/ImageCacheManager.php

@@ -6,22 +6,58 @@
  */
 
 class ImageCacheManager {
+    private static $memcached = null;
+
+    const EXPIRATION_SECONDS = 2592000; // 30 * 24 * 60 * 60 -> 30 gg
+
+    private static function getMemcached() {
+        if (is_null(self::$memcached)) {
+            self::$memcached = new Memcached();
+            self::$memcached->addServer('memcached', 11211);
+        }
+        return self::$memcached;
+    }
 	
+    private static function getImageKey(MediaModel $media, $size) {
+        return self::getImageKeyById($media->id, $size);
+    }
+    private static function getImageKeyById(string $id, $size) {
+        return $id."-".$size."-image";
+    }
+
+    private static function getMimeKey(MediaModel $media, $size) {
+        return self::getMimeKeyById($media->id, $size);
+    }
+    private static function getMimeKeyById(string $id, $size) {
+        return $id."-".$size."-mime";
+    }
+
 	public static function cacheImage(MediaModel $media, $size){
 		self::checkValidModel($media);
-		$cachedPath = self::getImageCachePath($media->id, $size);
+		// $cachedPath = self::getImageCachePath($media->id, $size);
-		$mimePath = self::getImageMimePath($media->id, $size);
+		// $mimePath = self::getImageMimePath($media->id, $size);
 		$originalFilePath = self::getOriginalPath($media);
 		
-		if ( SFSManager::fileExists($cachedPath) ){
+		// if ( SFSManager::fileExists($cachedPath) ){
-			SFSManager::deleteFile($cachedPath);
+		// 	SFSManager::deleteFile($cachedPath);
-			SFSManager::deleteFile($mimePath);
+		// 	SFSManager::deleteFile($mimePath);
-		}
+		// }
-		if (!is_dir(pathinfo($cachedPath,PATHINFO_DIRNAME))){
+		// if (!is_dir(pathinfo($cachedPath,PATHINFO_DIRNAME))){
-			SFSManager::createDirectory(pathinfo($cachedPath,PATHINFO_DIRNAME));
+		// 	SFSManager::createDirectory(pathinfo($cachedPath,PATHINFO_DIRNAME));
-		}
+		// }
-		SFSManager::writeFile(mime_content_type($originalFilePath), $mimePath);
+		// SFSManager::writeFile(mime_content_type($originalFilePath), $mimePath);
-		SFSManager::writeFile(self::getImageContent($media, $size), $cachedPath);
+		// SFSManager::writeFile(self::getImageContent($media, $size), $cachedPath);
+        self::getMemcached()->set(
+            self::getMimeKey($media, $size),
+            mime_content_type($originalFilePath),
+            self::EXPIRATION_SECONDS
+        );
+        self::getMemcached()->set(
+            self::getImageKey($media, $size),
+            self::getImageContent($media, $size),
+            self::EXPIRATION_SECONDS
+        );
+        
 	}
 	
 	/**
@@ -30,8 +66,9 @@ class ImageCacheManager {
 	 * @param int $size
 	 */
 	public static function isCached($id, $size){
-		$cachedPath = self::getImageCachePath($id, $size);
+        return self::getMemcached()->get(self::getImageKeyById($id, $size)) ? true : false;
-		return SFSManager::fileExists($cachedPath);
+		// $cachedPath = self::getImageCachePath($id, $size);
+		// return SFSManager::fileExists($cachedPath);
 	}
 	
 	
@@ -43,8 +80,9 @@ class ImageCacheManager {
 	 * @return string
 	 */
 	public static function getMimeType($id, $size){
-		$mimePath = self::getImageMimePath($id, $size);
+        return self::getMemcached()->get(self::getMimeKeyById($id, $size));
-		return file_get_contents($mimePath);
+		// $mimePath = self::getImageMimePath($id, $size);
+		// return file_get_contents($mimePath);
 	}
 	
 	/**
@@ -54,14 +92,14 @@ class ImageCacheManager {
 	 * @return string
 	 */
 	public static function getContent($id, $size){
-		$cachedPath = self::getImageCachePath($id, $size);
+        return self::getMemcached()->get(self::getImageKeyById($id, $size));
-		return file_get_contents($cachedPath);
+		// $cachedPath = self::getImageCachePath($id, $size);
+		// return file_get_contents($cachedPath);
 	}
 	
-	public static function printCachedMedia($id, $size){
+	public static function printCachedMedia($id, $size) {
-		$cachedPath = self::getImageCachePath($id, $size);
 		header('Content-type: '.self::getMimeType($id, $size));
-		return readfile($cachedPath);
+		echo self::getContent($id, $size);
 	}
 	
 	

app/public/getImage.php

@@ -17,7 +17,7 @@ if (array_key_exists("id",$_GET)) {
 		$size=intval($_GET['size']);
 	}
 	
-	if ($size == 3){
+	if ($size !== MediaImage::SIZE_ORIGINAL){
 		if (!ImageCacheManager::isCached($_GET["id"], $size)){
 			$img = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$_GET['id']));
 			if (!is_null($img)){
@@ -32,8 +32,8 @@ if (array_key_exists("id",$_GET)) {
 	else {
 		$img = GlobalVariables::get("dao")->getFirst("MediaModel",array("id"=>$_GET['id']));
 		
+        $basepath = GlobalVariables::get("config")->paths->media;
 		if (!is_null($img) && file_exists($basepath."/".$img->id.".".$img->extension)){
-			$basepath = GlobalVariables::get("config")->paths->media;
 			$toMime = $basepath."/".$img->id.".".$img->extension;
 			$thumb = new Imagick($basepath."/".$img->id.".".$img->extension);
 		

app/public/index.php

@@ -209,7 +209,7 @@ catch (Exception $ex){
 								if(!is_null($media)){
 									?>
 									<div class="ansaImage mediaContent">
-										<?php $media->renderMedia();?>
+										<?php $media->renderMedia(['size' => MediaImage::SIZE_BIG]);?>
 									</div>
 									<?php 	
 								}
@@ -246,7 +246,7 @@ catch (Exception $ex){
 								<div id="politica_<?php echo $i;?>" class="newsSummary"><?php 
 											$media = DaoMediaHandler::getMainMediaFromModel($politica);
 											if(!is_null($media)){?>
-												<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
+												<div class="newsMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_BIG]);?></div>
 									<?php 	}?>
 									<div class="newsTitle"><?php echo $stringTitolo;?></div>
 									<div class="newsSubTitle"><?php echo $string;?></div>
@@ -276,7 +276,7 @@ catch (Exception $ex){
 								<div id="cronaca_<?php echo $i;?>" class="newsSummary"><?php 
 											$media = DaoMediaHandler::getMainMediaFromModel($cronaca);
 											if(!is_null($media)){?>
-												<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
+												<div class="newsMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_BIG]);?></div>
 									<?php 	}?>
 									<div class="newsTitle"><?php echo $stringTitolo;?></div>
 									<div class="newsSubTitle"><?php echo $string;?></div>
@@ -305,7 +305,7 @@ catch (Exception $ex){
 							<div id="sport_<?php echo $i;?>" class="sportSummary"><?php 
 										$media = DaoMediaHandler::getMainMediaFromModel($sport);
 										if(!is_null($media)){?>
-											<div class="newsMainMedia mediaContent"><?php $media->renderMedia();?></div>
+											<div class="newsMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_BIG]);?></div>
 								<?php 	}?>
 								<div class="newsTitle"><?php echo $stringTitolo;?></div>
 								<div class="newsSubTitle"><?php echo $string;?></div>
@@ -334,7 +334,7 @@ catch (Exception $ex){
 					<a href="<?php echo $cultura->getAbsoluteUrl();?>" id="cultura_<?php echo $i;?>"  class="culturaNews"><?php 
 						$media = DaoMediaHandler::getMainMediaFromModel($cultura);
 						if(!is_null($media)){?>
-							<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+							<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 				<?php 	}?>
 						<div class="culturaTitle"><?php echo $string;?></div>
 					</a>
@@ -358,7 +358,7 @@ catch (Exception $ex){
 						<a href="<?php echo $ristoranti->getAbsoluteUrl();?>" id="ristoranti_<?php echo $i;?>" class="ristorantiBlock"><?php 
 							$media = DaoMediaHandler::getMainMediaFromModel($ristoranti);
 							if(!is_null($media)){?>
-								<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+								<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 					<?php 	}?>
 							<div class="ristorantiTitle"><?php echo $string;?></div>
 						</a>
@@ -381,7 +381,7 @@ catch (Exception $ex){
 					<a href="<?php echo $salute->getAbsoluteUrl();?>" id="salute_<?php echo $i;?>" class="saluteContainer">
 						<?php $media = DaoMediaHandler::getMainMediaFromModel($salute);
 								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 						<?php 	}?>
 						<div class="saluteTitle"><?php echo $stringTitle;?></div>
 					</a>
@@ -430,7 +430,7 @@ catch (Exception $ex){
 						<a href="<?php echo $gossip->getAbsoluteUrl();?>" id="gossip_<?php echo $i;?>"class="gossipContainer">
 							<?php $media = DaoMediaHandler::getMainMediaFromModel($gossip);
 								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 							<?php 	}?>
 							<div class="gossipTitle"><?php echo $stringTitle;?></div>
 						</a>
@@ -455,7 +455,7 @@ catch (Exception $ex){
 						<a href="<?php echo $professioni->getAbsoluteUrl();?>" id="gossip_<?php echo $i;?>"class="gossipContainer">
 							<?php $media = DaoMediaHandler::getMainMediaFromModel($professioni);
 								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 							<?php 	}?>
 							<div class="gossipTitle"><?php echo $stringTitle;?></div>
 						</a>
@@ -479,7 +479,7 @@ catch (Exception $ex){
 					<a href="<?php echo $elezioni->getAbsoluteUrl();?>" class="animaliContainer">
 						<?php $media = DaoMediaHandler::getMainMediaFromModel($elezioni);
 								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 						<?php 	}?>
 						<div class="viaggiTitle"><?php echo $stringTitle;?></div>
 					</a>
@@ -503,7 +503,7 @@ catch (Exception $ex){
 						<a href="<?php echo $viaggi->getAbsoluteUrl();?>" id="viaggi_<?php echo $i;?>"class="animaliContainer">
 							<?php $media = DaoMediaHandler::getMainMediaFromModel($viaggi);
 									if(!is_null($media)){?>
-										<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+										<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 							<?php 	}?>
 							<div class="viaggiTitle"><?php echo $stringTitle;?></div>
 						</a>
@@ -525,7 +525,7 @@ catch (Exception $ex){
 					<a href="<?php echo $animalNews->getAbsoluteUrl();?>" class="animaliContainer">
 						<?php $media = DaoMediaHandler::getMainMediaFromModel($animalNews);
 								if(!is_null($media)){?>
-									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia();?></div>
+									<div class="culturaMainMedia mediaContent"><?php $media->renderMedia(['size' => MediaImage::SIZE_MEDIUM]);?></div>
 						<?php 	}?>
 						<div class="animaliTitle"><?php echo $stringTitle;?></div>
 					</a>

cicd/docker-compose/deploy.yml

@@ -13,19 +13,20 @@ services:
         max-file: "5"
         max-size: "50m"
   webserver:
-    image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§
+    image: §PROJECT_REPOSITORY§/§PROJECT_GROUP§/§PROJECT_BUILDNAME§:§TAG_NAME§-webserver
     env_file:
     - environments/common/webserver.env
-    - environments/production/webserver.env
+    - environments/§ENVIRONMENT_TYPE§/webserver.env
     depends_on:
     - mongo
     - memcached
     restart: "on-failure:3"
-    ports:
-      - "80:80"
     networks:
       db-network:
       §PROJECT_BUILDNAME§-network:
+      nginx-network:
+        aliases:
+          - §PROJECT_BUILDNAME§.§ENVIRONMENT_TYPE§.webserver
     links:
       - mongo:database
     volumes:
@@ -65,6 +66,10 @@ services:
 networks:
   db-network:
   §PROJECT_BUILDNAME§-network:
+  nginx-network:
+    external: true
+    name: 
+      nginx-network
 
 
 volumes:

cicd/environments/production/webserver.env

@@ -3,7 +3,5 @@ DDNINJA_IS_PRODUCTION=true
 
 DDNINJA_MONGO_DBNAME=fdn2
 DDNINJA_MONGO_LOCATION=database
-DDNINJA_MONGO_USER=fdn2
-DDNINJA_MONGO_PASSWORD=p14n3ll1FDN2
 
-DDNINJA_PUBLIC_URL=http://www.ifattidinapoli.it
+DDNINJA_PUBLIC_URL=http://preproduction.ifattidinapoli.it

cicd/nginx/docker-compose.yml

@@ -0,0 +1,19 @@
+version: "3"
+services:
+  nginx:
+    image: nginx:1.16
+    ports:
+      - "80:80"
+      - "443:443"
+    networks:
+      - nginx-network
+    restart: always
+    volumes:
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+
+
+networks:
+  nginx-network:
+    external: true
+    name: 
+      nginx-network

cicd/nginx/nginx.conf

@@ -0,0 +1,32 @@
+worker_processes 1;
+
+events { worker_connections 1024; }
+
+http {
+        client_max_body_size 5M;
+
+		server {
+            listen 80;
+            server_name www.ifattidinapoli.it preproduction.ifattidinapoli.it default_server;
+
+            location / {
+                proxy_pass http://fdn2.production.webserver/;
+                proxy_redirect     off;
+                proxy_set_header Host $host;
+            }
+
+        }
+
+		server {
+            listen 80;
+            server_name test.ifattidinapoli.it;
+
+            location / {
+                proxy_pass http://fdn2.test.webserver/;
+                proxy_redirect     off;
+                proxy_set_header Host $host;
+            }
+
+        }
+
+}

scripts/core.sh

@@ -22,6 +22,7 @@ usage() {
     echo "     -u: Unit tests locally" 1>&2; 
     echo "     -d: Run debug vesion locally" 1>&2; 
     echo "     -p: Publish (requires a version)" 1>&2; 
+    echo "     -X: Staging Deploy (requires a version)" 1>&2; 
     echo "     -x: Production Deploy (requires a version)" 1>&2; 
     echo "  -t: Software version, this will be used for the docker tag (default: local)" 1>&2; 
     echo "  -v: Verbose" 1>&2; 
@@ -31,12 +32,13 @@ usage() {
 UNIT_MODE=0
 DEBUG_MODE=0
 PUBLISH_MODE=0
-DEPLOY_MODE=0
+DEPLOY_TEST_MODE=0
+DEPLOY_PROD_MODE=0
 SELECTED_MODES=0
 
 TAG="local"
 
-while getopts "t:hvudpx" o; do
+while getopts "t:hvudpxX" o; do
     case "${o}" in
         u)
             UNIT_MODE=1
@@ -50,8 +52,12 @@ while getopts "t:hvudpx" o; do
             PUBLISH_MODE=1
             SELECTED_MODES+=1
             ;;
+        X)
+            DEPLOY_TEST_MODE=1
+            SELECTED_MODES+=1
+            ;;
         x)
-            DEPLOY_MODE=1
+            DEPLOY_PROD_MODE=1
             SELECTED_MODES+=1
             ;;
         
@@ -134,9 +140,17 @@ if  [[ $DEBUG_MODE -eq 1 ]]; then
     xdg-open "$DDNINJA_PUBLIC_URL"
 fi
 
+if  [[ $DEPLOY_TEST_MODE -eq 1 ]]; then 
+    OUT_FOLDER="/home/$PROJECT_AUTHOR/$PROJECT_BUILDNAME/test"
+    mkdir -p $OUT_FOLDER
+    ./generateComposeFolder.sh -s -o "$OUT_FOLDER" -t $TAG
+    
+    cd "$OUT_FOLDER"
+    docker compose up -d
+fi
 
-if  [[ $DEPLOY_MODE -eq 1 ]]; then 
+if  [[ $DEPLOY_PROD_MODE -eq 1 ]]; then 
-    OUT_FOLDER="/home/$PROJECT_AUTHOR/$PROJECT_BUILDNAME/local"
+    OUT_FOLDER="/home/$PROJECT_AUTHOR/$PROJECT_BUILDNAME/production"
     mkdir -p $OUT_FOLDER
     ./generateComposeFolder.sh -p -o "$OUT_FOLDER" -t $TAG
     

scripts/generateComposeFolder.sh

@@ -33,6 +33,7 @@ usage() {
 STARTING_FILE=""
 CFGFILE="$DIR/../config"
 OUT_DIRECTORY=""
+ENV_TYPE="local"
 
 SELECTED_MODES=0
 
@@ -47,11 +48,13 @@ while getopts "i:o:t:hvlLsp" o; do
             SELECTED_MODES+=1
             ;;
         s)
-            STARTING_FILE="$DIR/../cicd/docker-compose/test.yml"
+            STARTING_FILE="$DIR/../cicd/docker-compose/deploy.yml"
+            ENV_TYPE="test"
             SELECTED_MODES+=1
             ;;
         p)
-            STARTING_FILE="$DIR/../cicd/docker-compose/production.yml"
+            STARTING_FILE="$DIR/../cicd/docker-compose/deploy.yml"
+            ENV_TYPE="production"
             SELECTED_MODES+=1
             ;;
         i)
@@ -89,5 +92,5 @@ fi
 
 cp -rT "$DIR/../cicd/environments" "$OUT_DIRECTORY/environments"
 
-buildTemplate -f "$CFGFILE" -t "$STARTING_FILE" -o "$OUT_DIRECTORY/docker-compose.yml" --add TAG_NAME=$TAG
+buildTemplate -f "$CFGFILE" -t "$STARTING_FILE" -o "$OUT_DIRECTORY/docker-compose.yml" --add TAG_NAME=$TAG --add ENVIRONMENT_TYPE=$ENV_TYPE