diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 02:13:02 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-07-05 02:13:02 +0900 |
| commit | d078f786028c066d536990c280091f9c43b67ec9 (patch) | |
| tree | 4892e2dd4d94cb5d8dd3ce81d4c7ba6b190f7960 /src/queue/processors/object-storage/delete-file.ts | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.24.0 (diff) | |
| download | misskey-d078f786028c066d536990c280091f9c43b67ec9.tar.gz misskey-d078f786028c066d536990c280091f9c43b67ec9.tar.bz2 misskey-d078f786028c066d536990c280091f9c43b67ec9.zip | |
Merge branch 'develop'
Diffstat (limited to 'src/queue/processors/object-storage/delete-file.ts')
| -rw-r--r-- | src/queue/processors/object-storage/delete-file.ts | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/queue/processors/object-storage/delete-file.ts b/src/queue/processors/object-storage/delete-file.ts index 8e6b5f959e..f899df7d2e 100644 --- a/src/queue/processors/object-storage/delete-file.ts +++ b/src/queue/processors/object-storage/delete-file.ts @@ -1,22 +1,10 @@ import * as Bull from 'bull'; -import * as Minio from 'minio'; -import { fetchMeta } from '../../../misc/fetch-meta'; +import { deleteObjectStorageFile } from '../../../services/drive/delete-file'; export default async (job: Bull.Job) => { - const meta = await fetchMeta(); - - const minio = new Minio.Client({ - endPoint: meta.objectStorageEndpoint!, - region: meta.objectStorageRegion ? meta.objectStorageRegion : undefined, - port: meta.objectStoragePort ? meta.objectStoragePort : undefined, - useSSL: meta.objectStorageUseSSL, - accessKey: meta.objectStorageAccessKey!, - secretKey: meta.objectStorageSecretKey!, - }); - const key: string = job.data.key; - await minio.removeObject(meta.objectStorageBucket!, key); + await deleteObjectStorageFile(key); return 'Success'; }; |