Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

feat(server): added global log context (#636)

Corentin Thomasset19f96a162596
diff --git a/apps/papra-server/package.json b/apps/papra-server/package.json
index d924ee79..0fe2b6dc 100644
--- a/apps/papra-server/package.json
+++ b/apps/papra-server/package.json
@@ -47,7 +47,7 @@
"@corentinth/chisels": "catalog:",
"@corentinth/friendly-ids": "^0.0.1",
"@crowlog/async-context-plugin": "^2.0.0",
- "@crowlog/logger": "^2.0.0",
+ "@crowlog/logger": "^2.1.0",
"@hono/node-server": "^1.14.4",
"@libsql/client": "^0.14.0",
"@owlrelay/api-sdk": "^0.0.2",
diff --git a/apps/papra-server/src/index.ts b/apps/papra-server/src/index.ts
index 80ca0f6a..537bd062 100644
--- a/apps/papra-server/src/index.ts
+++ b/apps/papra-server/src/index.ts
@@ -8,7 +8,7 @@ import { createServer } from './modules/app/server';
import { parseConfig } from './modules/config/config';
import { createDocumentStorageService } from './modules/documents/storage/documents.storage.services';
import { createIngestionFolderWatcher } from './modules/ingestion-folders/ingestion-folders.usecases';
-import { createLogger } from './modules/shared/logger/logger';
+import { addToGlobalLogContext, createLogger } from './modules/shared/logger/logger';
import { registerTaskDefinitions } from './modules/tasks/tasks.definitions';
import { createTaskServices } from './modules/tasks/tasks.services';
@@ -16,6 +16,8 @@ const logger = createLogger({ namespace: 'app-server' });
const { config } = await parseConfig({ env });
+addToGlobalLogContext({ processMode: config.processMode });
+
const isWebMode = config.processMode === 'all' || config.processMode === 'web';
const isWorkerMode = config.processMode === 'all' || config.processMode === 'worker';
diff --git a/apps/papra-server/src/modules/shared/logger/logger.ts b/apps/papra-server/src/modules/shared/logger/logger.ts
index 6904b63e..cfd2b5d1 100644
--- a/apps/papra-server/src/modules/shared/logger/logger.ts
+++ b/apps/papra-server/src/modules/shared/logger/logger.ts
@@ -1,8 +1,12 @@
import type { Logger } from '@crowlog/logger';
import { addLogContext, createAsyncContextPlugin, wrapWithLoggerContext } from '@crowlog/async-context-plugin';
-import { createLoggerFactory } from '@crowlog/logger';
+import { createGlobalLogContextPlugin, createLoggerFactory } from '@crowlog/logger';
+
+const { addToGlobalLogContext, globalContextPlugin } = createGlobalLogContextPlugin<{
+ processMode: 'web' | 'worker' | 'all';
+}>();
export type { Logger };
-export { addLogContext, wrapWithLoggerContext };
+export { addLogContext, addToGlobalLogContext, wrapWithLoggerContext };
-export const createLogger = createLoggerFactory({ plugins: [createAsyncContextPlugin()] });
+export const createLogger = createLoggerFactory({ plugins: [createAsyncContextPlugin(), globalContextPlugin] });
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e44a905..3cb1b19f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -272,8 +272,8 @@ importers:
specifier: ^2.0.0
version: 2.0.0
'@crowlog/logger':
- specifier: ^2.0.0
- version: 2.0.0
+ specifier: ^2.1.0
+ version: 2.1.0
'@hono/node-server':
specifier: ^1.14.4
version: 1.14.4([email protected])
@@ -1192,8 +1192,8 @@ packages:
resolution: {integrity: sha512-nlzv+dXfWxuY2/O05m05YT/1e5u/x/EKF1HnHdNJVDUI7OUs4ZrNF1jsKP9GnNoApaXNnYiPrDBlYcH80DkDPw==}
engines: {node: '>=22.0.0'}
- '@crowlog/[email protected]':
- resolution: {integrity: sha512-TNbi6SutY8gvwvE6YvJIxOxa6Rrj6u8iieawwF+KzSbxxBAgPQ7wtGI5Hmf4LSs6dJNElx441Cw4vQyMHFlq5w==}
+ '@crowlog/[email protected]':
+ resolution: {integrity: sha512-dPlzr9y0EXUweHGAcM35HTEcLf0VDsakgJ9H47/mOfzq4gCN+Uh1qPY8EkMF1cZWMGhJ9K2TFXPFzMwfA5AIeA==}
engines: {node: '>=22.0.0'}
'@crowlog/[email protected]':
@@ -1262,9 +1262,11 @@ packages:
'@esbuild-kit/[email protected]':
resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
+ deprecated: 'Merged into tsx: https://tsx.is'
'@esbuild-kit/[email protected]':
resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
+ deprecated: 'Merged into tsx: https://tsx.is'
'@esbuild/[email protected]':
resolution: {integrity: sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==}
@@ -4552,6 +4554,9 @@ packages:
resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+ resolution: {integrity: sha512-98XGutrXoh75MlgLihlNxAGbUuFQc7l1cqcnEZlLNKc0UrVdPndgmaDmYTDDh929VS/eqTZV0rozmhu2qqT1/g==}
+
resolution: {integrity: sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==}
engines: {node: '>= 12'}
@@ -6332,6 +6337,7 @@ packages:
resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
engines: {node: '>=10.5.0'}
+ deprecated: Use your platform's native DOMException instead
resolution: {integrity: sha512-8Mc2HhqPdlIfedsuZoc3yioPuzp6b+L5jRCRY1QzuWZh2EGJVQrGppC6V6cF0bLdbW0+O2YpqCA25aF/1lvipQ==}
@@ -7054,6 +7060,7 @@ packages:
resolution: {integrity: sha512-+AbdxhM9kJsHtruUF39bwS/B0Fytw6Fr1o4ZAIAEqA6cke2xcoO2GleBw9Zw7nRzILVEgz7zBM5GiTJjie1G9A==}
engines: {node: '>=14.0.0', npm: '>=6.0.0'}
+ deprecated: 'SECURITY: Multiple vulnerabilities fixed in 8.0.1 (XML injection, path traversal, command injection, protocol injection). Upgrade immediately: npm install [email protected]'
hasBin: true
@@ -9316,7 +9323,7 @@ snapshots:
'@crowlog/[email protected]': {}
- '@crowlog/[email protected]': {}
+ '@crowlog/[email protected]': {}
'@crowlog/[email protected]':
dependencies:
@@ -12015,7 +12022,7 @@ snapshots:
'@vue/reactivity': 3.5.13
'@vue/runtime-core': 3.5.13
'@vue/shared': 3.5.13
- csstype: 3.1.3
+ csstype: 3.2.1
dependencies:
@@ -12733,6 +12740,8 @@ snapshots:
+