Fix console, seperate logging envirement, pass clock to log

hpi-schul-cloud · Jun 24, 2024 · 076ff46 · 076ff46
1 parent 56f0a78
commit 076ff46
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/apps/server/src/modules/tldraw/config.ts b/apps/server/src/modules/tldraw/config.ts
@@ -25,7 +25,7 @@ export const TLDRAW_SOCKET_PORT = Configuration.get('TLDRAW__SOCKET_PORT') as nu
 
 const tldrawConfig = {
 	TLDRAW_DB_URL,
-	NEST_LOG_LEVEL: Configuration.get('NEST_LOG_LEVEL') as string,
+	NEST_LOG_LEVEL: Configuration.get('TLDRAW__LOG_LEVEL') as string,
 	INCOMING_REQUEST_TIMEOUT: Configuration.get('INCOMING_REQUEST_TIMEOUT_API') as number,
 	TLDRAW_DB_COMPRESS_THRESHOLD: Configuration.get('TLDRAW__DB_COMPRESS_THRESHOLD') as number,
 	FEATURE_TLDRAW_ENABLED: Configuration.get('FEATURE_TLDRAW_ENABLED') as boolean,

diff --git a/apps/server/src/modules/tldraw/repo/y-mongodb.ts b/apps/server/src/modules/tldraw/repo/y-mongodb.ts
@@ -122,7 +122,7 @@ export class YMongodb implements OnModuleInit {
 			ydoc.destroy();
 			performance.mark('compressDocumentTransactional - end');
 			performance.measure(
-				`tldraw:YMongodb:compressDocumentTransactional::${docName}`,
+				`tldraw:YMongodb:compressDocumentTransactional::${docName}, clock=${clock}`,
 				'compressDocumentTransactional - start',
 				'compressDocumentTransactional - end'
 			);

diff --git a/apps/server/src/modules/tldraw/tldraw-console.module.ts b/apps/server/src/modules/tldraw/tldraw-console.module.ts
@@ -7,6 +7,7 @@ import { Dictionary, IPrimaryKey } from '@mikro-orm/core';
 import { RabbitMQWrapperModule } from '@infra/rabbitmq';
 import { ConsoleWriterModule } from '@infra/console';
 import { ConsoleModule } from 'nestjs-console';
+import { CoreModule } from '@src/core';
 import { FilesStorageClientModule } from '../files-storage-client';
 import { config, TLDRAW_DB_URL } from './config';
 import { TldrawDrawing } from './entities';
@@ -23,6 +24,7 @@ const defaultMikroOrmOptions: MikroOrmModuleSyncOptions = {
 
 @Module({
 	imports: [
+		CoreModule,
 		ConsoleModule,
 		ConsoleWriterModule,
 		RabbitMQWrapperModule,

diff --git a/config/default.schema.json b/config/default.schema.json
@@ -1582,6 +1582,12 @@
 					"type": "boolean",
 					"description": "Activate the performance measure for overserved areas.",
 					"default": true
+				},
+				"LOG_LEVEL": {
+					"type": "string",
+					"default": "info",
+					"description": "Nest Log level for api. The http flag is for request logging. The http flag do only work by api methods with added 'request logging interceptor'.",
+					"enum": ["emerg", "alert", "crit", "error", "warning", "notice", "info", "debug"]
 				}
 			},
 			"default": {