Added enums, moved Mikro ORM config into server.ts, cleaned configuration and env files

This commit is contained in:
2024-12-24 22:17:41 +01:00
parent 8980691409
commit 8377fe6545
5 changed files with 73 additions and 28 deletions

View File

@ -8,7 +8,7 @@ import cors from 'cors'
import { Server as SocketServer } from 'socket.io'
import { Authentication } from './middleware/authentication'
import { TSocket } from './utilities/types'
import { MikroORM } from '@mikro-orm/mariadb'
import { MariaDbDriver, MikroORM } from '@mikro-orm/mariadb'
import prisma from './utilities/prisma'
import { appLogger, watchLogs } from './utilities/logger'
import ZoneManager from './managers/zoneManager'
@ -17,6 +17,7 @@ import CommandManager from './managers/commandManager'
import QueueManager from './managers/queueManager'
import DateManager from './managers/dateManager'
import WeatherManager from './managers/weatherManager'
import { Migrator } from '@mikro-orm/migrations'
export class Server {
private readonly app: Application
@ -60,7 +61,21 @@ export class Server {
// MikroORM
try {
const orm = await MikroORM.init();
const orm = await MikroORM.init({
extensions: [Migrator],
entities: ['./src/entities/**/*.js'],
entitiesTs: ['./src/entities/**/*.ts'],
driver: MariaDbDriver,
dbName: config.DB_NAME,
host: config.DB_HOST,
port: config.DB_PORT,
user: config.DB_USER,
password: config.DB_PASSWORD,
debug: config.ENV !== 'production',
driverOptions: {
allowPublicKeyRetrieval: true
}
});
appLogger.info('Database 2 connected')
} catch (error: any) {
appLogger.error(`Database 2 connection failed: ${error.message}`)