From 96bc17aa1014983d5e6bf8b4c05d898156995a0d Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Wed, 6 Feb 2019 22:44:55 +0900 Subject: Check config on load (#4170) Co-authored-by: syuilo --- src/tools/move-drive-files.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/tools') diff --git a/src/tools/move-drive-files.ts b/src/tools/move-drive-files.ts index 8a1e944503..263e5e125d 100644 --- a/src/tools/move-drive-files.ts +++ b/src/tools/move-drive-files.ts @@ -37,8 +37,9 @@ async function job(file: IDriveFile): Promise { const thumbnailKeyDir = `${config.drive.prefix}/${uuid.v4()}`; const thumbnailKey = `${thumbnailKeyDir}/${name}.thumbnail.jpg`; - const baseUrl = config.drive.baseUrl - || `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`; + const baseUrl = config.drive.baseUrl.getOrElse( + `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }` + ); const bucket = await getDriveFileBucket(); const readable = bucket.openDownloadStream(file._id); -- cgit v1.2.3-freya