Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Framasoft
PeerTube
PeerTube
Commits
eb7b48ce
Verified
Commit
eb7b48ce
authored
Jul 27, 2022
by
Chocobozzz
Browse files
Prevent logging an error on lazy static 404
parent
e3d6c643
Changes
3
Hide whitespace changes
Inline
Side-by-side
server/controllers/lazy-static.ts
View file @
eb7b48ce
...
...
@@ -7,7 +7,7 @@ import { logger } from '../helpers/logger'
import
{
ACTOR_IMAGES_SIZE
,
LAZY_STATIC_PATHS
,
STATIC_MAX_AGE
}
from
'
../initializers/constants
'
import
{
VideosCaptionCache
,
VideosPreviewCache
}
from
'
../lib/files-cache
'
import
{
actorImagePathUnsafeCache
,
downloadActorImageFromWorker
}
from
'
../lib/local-actor
'
import
{
asyncMiddleware
}
from
'
../middlewares
'
import
{
asyncMiddleware
,
handleStaticError
}
from
'
../middlewares
'
import
{
ActorImageModel
}
from
'
../models/actor/actor-image
'
const
lazyStaticRouter
=
express
.
Router
()
...
...
@@ -16,27 +16,32 @@ lazyStaticRouter.use(cors())
lazyStaticRouter
.
use
(
LAZY_STATIC_PATHS
.
AVATARS
+
'
:filename
'
,
asyncMiddleware
(
getActorImage
)
asyncMiddleware
(
getActorImage
),
handleStaticError
)
lazyStaticRouter
.
use
(
LAZY_STATIC_PATHS
.
BANNERS
+
'
:filename
'
,
asyncMiddleware
(
getActorImage
)
asyncMiddleware
(
getActorImage
),
handleStaticError
)
lazyStaticRouter
.
use
(
LAZY_STATIC_PATHS
.
PREVIEWS
+
'
:filename
'
,
asyncMiddleware
(
getPreview
)
asyncMiddleware
(
getPreview
),
handleStaticError
)
lazyStaticRouter
.
use
(
LAZY_STATIC_PATHS
.
VIDEO_CAPTIONS
+
'
:filename
'
,
asyncMiddleware
(
getVideoCaption
)
asyncMiddleware
(
getVideoCaption
),
handleStaticError
)
lazyStaticRouter
.
use
(
LAZY_STATIC_PATHS
.
TORRENTS
+
'
:filename
'
,
asyncMiddleware
(
getTorrent
)
asyncMiddleware
(
getTorrent
),
handleStaticError
)
// ---------------------------------------------------------------------------
...
...
server/controllers/static.ts
View file @
eb7b48ce
import
{
HttpStatusCode
}
from
'
@shared/models
'
import
cors
from
'
cors
'
import
express
from
'
express
'
import
{
handleStaticError
}
from
'
@server/middlewares
'
import
{
CONFIG
}
from
'
../initializers/config
'
import
{
HLS_STREAMING_PLAYLIST_DIRECTORY
,
STATIC_MAX_AGE
,
STATIC_PATHS
}
from
'
../initializers/constants
'
...
...
@@ -41,19 +41,3 @@ staticRouter.use(
export
{
staticRouter
}
// ---------------------------------------------------------------------------
function
handleStaticError
(
err
:
any
,
req
:
express
.
Request
,
res
:
express
.
Response
,
next
:
express
.
NextFunction
)
{
const
message
=
err
.
message
||
''
if
(
message
.
includes
(
'
ENOENT
'
))
{
return
res
.
fail
({
status
:
err
.
status
||
HttpStatusCode
.
INTERNAL_SERVER_ERROR_500
,
message
:
err
.
message
,
type
:
err
.
name
})
}
return
next
(
err
)
}
server/middlewares/error.ts
View file @
eb7b48ce
...
...
@@ -40,6 +40,21 @@ function apiFailMiddleware (req: express.Request, res: express.Response, next: e
if
(
next
)
next
()
}
function
handleStaticError
(
err
:
any
,
req
:
express
.
Request
,
res
:
express
.
Response
,
next
:
express
.
NextFunction
)
{
const
message
=
err
.
message
||
''
if
(
message
.
includes
(
'
ENOENT
'
))
{
return
res
.
fail
({
status
:
err
.
status
||
HttpStatusCode
.
INTERNAL_SERVER_ERROR_500
,
message
:
err
.
message
,
type
:
err
.
name
})
}
return
next
(
err
)
}
export
{
apiFailMiddleware
apiFailMiddleware
,
handleStaticError
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment