Merge branch 'staging' into dev/Maddy/fix/listeningAfterDb

1 files changed, 9 insertions, 13 deletions

diff --git a/cdn/src/util/Storage.ts b/src/cdn/util/Storage.ts

index 89dd5634..1ab6a1d9 100644
--- a/cdn/src/util/Storage.ts
+++ b/src/cdn/util/Storage.ts
@@ -1,8 +1,9 @@
-import { FileStorage } from "./FileStorage";
 import path from "path";
-import fse from "fs-extra";
-import { bgCyan, black } from "picocolors";
+import { FileStorage } from "./FileStorage";
+//import fse from "fs-extra";
 import { S3 } from "@aws-sdk/client-s3";
+import fs from "fs";
+import { bgCyan, black } from "picocolors";
 import { S3Storage } from "./S3Storage";
 process.cwd();
 
@@ -22,7 +23,8 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) {
 		location = path.join(process.cwd(), "files");
 	}
 	console.log(`[CDN] storage location: ${bgCyan(`${black(location)}`)}`);
-	fse.ensureDirSync(location);
+	//fse.ensureDirSync(location);
+	fs.mkdirSync(location, { recursive: true });
 	process.env.STORAGE_LOCATION = location;
 
 	storage = new FileStorage();
@@ -31,16 +33,12 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) {
 		bucket = process.env.STORAGE_BUCKET;
 
 	if (!region) {
-		console.error(
-			`[CDN] You must provide a region when using the S3 storage provider.`
-		);
+		console.error(`[CDN] You must provide a region when using the S3 storage provider.`);
 		process.exit(1);
 	}
 
 	if (!bucket) {
-		console.error(
-			`[CDN] You must provide a bucket when using the S3 storage provider.`
-		);
+		console.error(`[CDN] You must provide a bucket when using the S3 storage provider.`);
 		process.exit(1);
 	}
 
@@ -48,9 +46,7 @@ if (process.env.STORAGE_PROVIDER === "file" || !process.env.STORAGE_PROVIDER) {
 	let location = process.env.STORAGE_LOCATION;
 
 	if (!location) {
-		console.warn(
-			`[CDN] STORAGE_LOCATION unconfigured for S3 provider, defaulting to the bucket root...`
-		);
+		console.warn(`[CDN] STORAGE_LOCATION unconfigured for S3 provider, defaulting to the bucket root...`);
 		location = undefined;
 	}