diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-09-03 21:00:44 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2021-09-03 21:13:06 +0900 |
| commit | e1a8b158e04ad567d92d8daf3cc0898ee18f1a2e (patch) | |
| tree | 436c3a15daed01189abdc0c08f21ac9e71fc034e /src/server | |
| parent | Update CONTRIBUTING.md (diff) | |
| download | sharkey-e1a8b158e04ad567d92d8daf3cc0898ee18f1a2e.tar.gz sharkey-e1a8b158e04ad567d92d8daf3cc0898ee18f1a2e.tar.bz2 sharkey-e1a8b158e04ad567d92d8daf3cc0898ee18f1a2e.zip | |
Tune download (#2)
* s2-2
* allowedPrivateNetworks
* style
* Proxyの間にあると誤解しそうなのでconfigの記述順を変更
* Fix error handler
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/file/send-drive-file.ts | 6 | ||||
| -rw-r--r-- | src/server/proxy/proxy-media.ts | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts index c455de6447..a73164ed21 100644 --- a/src/server/file/send-drive-file.ts +++ b/src/server/file/send-drive-file.ts @@ -83,10 +83,10 @@ export default async function(ctx: Koa.Context) { ctx.set('Content-Type', image.type); ctx.set('Cache-Control', 'max-age=31536000, immutable'); } catch (e) { - serverLogger.error(e); + serverLogger.error(e.statusCode); - if (typeof e == 'number' && e >= 400 && e < 500) { - ctx.status = e; + if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) { + ctx.status = e.statusCode; ctx.set('Cache-Control', 'max-age=86400'); } else { ctx.status = 500; diff --git a/src/server/proxy/proxy-media.ts b/src/server/proxy/proxy-media.ts index fb38a5c07b..3bd65dfe67 100644 --- a/src/server/proxy/proxy-media.ts +++ b/src/server/proxy/proxy-media.ts @@ -39,8 +39,8 @@ export async function proxyMedia(ctx: Koa.Context) { } catch (e) { serverLogger.error(e); - if (typeof e == 'number' && e >= 400 && e < 500) { - ctx.status = e; + if (typeof e.statusCode === 'number' && e.statusCode >= 400 && e.statusCode < 500) { + ctx.status = e.statusCode; } else { ctx.status = 500; } |