Skip to content

ActivityPub-federated video streaming platform using P2P directly in your web browser

Add logger suport to uploadx

Chocobozzz5cef0b48ca9f
diff --git a/package.json b/package.json
index bd2702b401..427d9df8cd 100644
--- a/package.json
+++ b/package.json
@@ -206,6 +206,7 @@
"yauzl": "^3.4.0"
},
"devDependencies": {
+ "@logtape/adaptor-winston": "^2.3.0",
"@stylistic/eslint-plugin": "^5.10.0",
"@types/archiver": "^8.0.0",
"@types/bcrypt": "^6.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3e9c087ead..a13ceb6848 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -366,6 +366,9 @@ importers:
specifier: ^3.4.0
version: 3.4.0
devDependencies:
+ '@logtape/adaptor-winston':
+ specifier: ^2.3.0
+ version: 2.3.0(@logtape/[email protected])([email protected])
'@stylistic/eslint-plugin':
specifier: ^5.10.0
@@ -2583,6 +2586,12 @@ packages:
cpu: [x64]
os: [win32]
+ '@logtape/[email protected]':
+ resolution: {integrity: sha512-RgF6QDi9tvPOQ72mJ6w4u8KM+3buEy/EQAaETD5GiqHd/XDINVF/Bro/VS53Fw/3sfEz4kCOOaRJy36JorYwEg==}
+ peerDependencies:
+ '@logtape/logtape': ^2.3.0
+ winston: ^3.17.0
+
'@logtape/[email protected]':
resolution: {integrity: sha512-s/pxCgf9Gg75ypTV/bRUq355Dy/JP/zUJWfgJQPO5pTkXC23X2AXBcmBBgFiWH+bSi4yiX/G06qGV8CdAWD3SA==}
@@ -13973,6 +13982,11 @@ snapshots:
optional: true
+ dependencies:
+ '@logtape/logtape': 2.3.0
+ winston: 3.19.0
+
'@logtape/[email protected]': {}
'@messageformat/[email protected]':
diff --git a/server/core/lib/uploadx.ts b/server/core/lib/uploadx.ts
index 18ead94f30..fe161d4fe7 100644
--- a/server/core/lib/uploadx.ts
+++ b/server/core/lib/uploadx.ts
@@ -1,13 +1,14 @@
+import { install } from '@logtape/adaptor-winston'
import { buildLogger } from '@server/helpers/logger.js'
import { getResumableUploadPath } from '@server/helpers/upload.js'
-import { CONFIG } from '@server/initializers/config.js'
import { authenticate } from '@server/middlewares/auth.js'
import { resumableInitValidator } from '@server/middlewares/validators/resumable-upload.js'
-import { FileQuery, LogLevel, Uploadx, Metadata as UploadXMetadata } from '@uploadx/core'
+import { FileQuery, Uploadx, Metadata as UploadXMetadata } from '@uploadx/core'
import express, { NextFunction, Request, RequestHandler, Response } from 'express'
import { extname } from 'path'
const logger = buildLogger({ labelSuffix: 'uploadx' })
+install(logger)
export const uploadx = new Uploadx({
directory: getResumableUploadPath(),
@@ -17,9 +18,6 @@ export const uploadx = new Uploadx({
// Could be big with a big thumbnail
maxMetadataSize: '10MB',
- // TODO: bind it to our logger
- logLevel: CONFIG.LOG.LEVEL as LogLevel,
-
userIdentifier: (_, res: express.Response) => {
if (!res.locals.oauth) return undefined