diff --git a/apps/dokploy/setup.ts b/apps/dokploy/setup.ts index c4c9a372..cb3f5eec 100644 --- a/apps/dokploy/setup.ts +++ b/apps/dokploy/setup.ts @@ -1,15 +1,17 @@ import { createDefaultMiddlewares, - createDefaultServerTraefikConfig, createDefaultTraefikConfig, - initializeNetwork, - initializePostgres, - initializeRedis, - initializeSwarm, + createDefaultServerTraefikConfig, initializeTraefik, - setupDirectories, -} from "@dokploy/server"; +} from "@dokploy/server/dist/setup/traefik-setup"; +import { + initializeNetwork, + initializeSwarm, +} from "@dokploy/server/dist/setup/setup"; +import { setupDirectories } from "@dokploy/server/dist/setup/config-paths"; +import { initializePostgres } from "@dokploy/server/dist/setup/postgres-setup"; +import { initializeRedis } from "@dokploy/server/dist/setup/redis-setup"; (async () => { try { setupDirectories(); diff --git a/packages/server/src/db/reset.ts b/packages/server/src/db/reset.ts index d280e0f2..4a4dbecb 100644 --- a/packages/server/src/db/reset.ts +++ b/packages/server/src/db/reset.ts @@ -1,23 +1,23 @@ -// import { sql } from "drizzle-orm"; -// // Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406 -// import { drizzle } from "drizzle-orm/postgres-js"; -// import postgres from "postgres"; +import { sql } from "drizzle-orm"; +// Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406 +import { drizzle } from "drizzle-orm/postgres-js"; +import postgres from "postgres"; -// const connectionString = process.env.DATABASE_URL || ""; +const connectionString = process.env.DATABASE_URL || ""; -// const pg = postgres(connectionString, { max: 1 }); -// const db = drizzle(pg); +const pg = postgres(connectionString, { max: 1 }); +const db = drizzle(pg); -// const clearDb = async (): Promise => { -// try { -// const tablesQuery = sql`DROP SCHEMA public CASCADE; CREATE SCHEMA public; DROP schema drizzle CASCADE;`; -// const tables = await db.execute(tablesQuery); -// console.log(tables); -// await pg.end(); -// } catch (error) { -// console.error("Error to clean database", error); -// } finally { -// } -// }; +const clearDb = async (): Promise => { + try { + const tablesQuery = sql`DROP SCHEMA public CASCADE; CREATE SCHEMA public; DROP schema drizzle CASCADE;`; + const tables = await db.execute(tablesQuery); + console.log(tables); + await pg.end(); + } catch (error) { + console.error("Error to clean database", error); + } finally { + } +}; -// clearDb(); +clearDb(); diff --git a/packages/server/src/utils/access-log/handler.ts b/packages/server/src/utils/access-log/handler.ts index 0e2c659c..abc6ee3d 100644 --- a/packages/server/src/utils/access-log/handler.ts +++ b/packages/server/src/utils/access-log/handler.ts @@ -1,7 +1,8 @@ import { IS_CLOUD, paths } from "@/server/constants"; -import { findAdmin, updateAdmin } from "@/server/services/admin"; +import { updateAdmin } from "@/server/services/admin"; import { type RotatingFileStream, createStream } from "rotating-file-stream"; import { execAsync } from "../process/execAsync"; +import { db } from "../../db"; class LogRotationManager { private static instance: LogRotationManager; @@ -29,13 +30,17 @@ class LogRotationManager { } private async getStateFromDB(): Promise { - const setting = await findAdmin(); + const setting = await db.query.admins.findFirst({}); return setting?.enableLogRotation ?? false; } private async setStateInDB(active: boolean): Promise { - const admin = await findAdmin(); - await updateAdmin(admin.authId, { + const admin = await db.query.admins.findFirst({}); + + if (!admin) { + return; + } + await updateAdmin(admin?.authId, { enableLogRotation: active, }); }