From 3d8a66eeaa09cbab37bc63df6ea45ac997d332cf Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 16 May 2025 10:43:17 +0200 Subject: [PATCH] rollback database logger path changes, rollback start script using yarn for staring instead of turbo to keep behaviour --- backend/src/typeorm/connection.ts | 3 +-- deployment/bare_metal/start.sh | 6 +++--- dht-node/src/typeorm/connection.ts | 3 +-- federation/src/typeorm/connection.ts | 3 +-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index 25c47b8dc..0bb1b76bf 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -3,7 +3,6 @@ import { entities } from 'database' import { Connection as DbConnection, FileLogger, createConnection } from 'typeorm' -import path from 'node:path' import { CONFIG } from '@/config' export class Connection { @@ -39,7 +38,7 @@ export class Connection { synchronize: false, logging: true, logger: new FileLogger('all', { - logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH), + logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH, }), extra: { charset: 'utf8mb4_unicode_ci', diff --git a/deployment/bare_metal/start.sh b/deployment/bare_metal/start.sh index c8985bca6..878cb470f 100755 --- a/deployment/bare_metal/start.sh +++ b/deployment/bare_metal/start.sh @@ -307,12 +307,12 @@ else fi # start after building all to use up less ressources -pm2 start --name gradido-backend "turbo backend#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' +pm2 start --name gradido-backend "yarn --cwd $PROJECT_ROOT/backend start" -l $GRADIDO_LOG_PATH/pm2.backend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' #pm2 start --name gradido-frontend "yarn --cwd $PROJECT_ROOT/frontend start" -l $GRADIDO_LOG_PATH/pm2.frontend.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' #pm2 start --name gradido-admin "yarn --cwd $PROJECT_ROOT/admin start" -l $GRADIDO_LOG_PATH/pm2.admin.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save if [ ! -z $FEDERATION_DHT_TOPIC ]; then - pm2 start --name gradido-dht-node "turbo dht-node#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' + pm2 start --name gradido-dht-node "yarn --cwd $PROJECT_ROOT/dht-node start" -l $GRADIDO_LOG_PATH/pm2.dht-node.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save else log_step "=====================================================================" @@ -336,7 +336,7 @@ do log_step "====================================================" log_step " start $MODULENAME listening on port=$FEDERATION_PORT" log_step "====================================================" - pm2 start --name $MODULENAME "turbo federation#start --env-mode=loose" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' + pm2 start --name $MODULENAME "yarn --cwd $PROJECT_ROOT/federation start" -l $GRADIDO_LOG_PATH/pm2.$MODULENAME.$TODAY.log --log-date-format 'YYYY-MM-DD HH:mm:ss.SSS' pm2 save done diff --git a/dht-node/src/typeorm/connection.ts b/dht-node/src/typeorm/connection.ts index abac05b38..9df511455 100644 --- a/dht-node/src/typeorm/connection.ts +++ b/dht-node/src/typeorm/connection.ts @@ -1,4 +1,3 @@ -import path from 'node:path' import { CONFIG } from '@/config' // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation @@ -19,7 +18,7 @@ export const connection = async (): Promise => { synchronize: false, logging: true, logger: new FileLogger('all', { - logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH), + logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH, }), extra: { charset: 'utf8mb4_unicode_ci', diff --git a/federation/src/typeorm/connection.ts b/federation/src/typeorm/connection.ts index 91449d4de..f76628767 100644 --- a/federation/src/typeorm/connection.ts +++ b/federation/src/typeorm/connection.ts @@ -1,4 +1,3 @@ -import path from 'node:path' import { CONFIG } from '@/config' // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation @@ -19,7 +18,7 @@ const connection = async (): Promise => { synchronize: false, logging: true, logger: new FileLogger('all', { - logPath: path.resolve(process.cwd(), CONFIG.TYPEORM_LOGGING_RELATIVE_PATH), + logPath: CONFIG.TYPEORM_LOGGING_RELATIVE_PATH, }), extra: { charset: 'utf8mb4_unicode_ci',