Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(setup): import directly from specific path

Browse Source
This commit is contained in:
Mauricio Siu
2024-10-16 15:57:51 -06:00
parent c4654a9619
commit fe19cdb5e4
3 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/dokploy/setup.ts
View File

@@ -1,15 +1,17 @@
import { import {
createDefaultMiddlewares, createDefaultMiddlewares,
createDefaultServerTraefikConfig,
createDefaultTraefikConfig, createDefaultTraefikConfig,
initializeNetwork, createDefaultServerTraefikConfig,
initializePostgres,
initializeRedis,
initializeSwarm,
initializeTraefik, initializeTraefik,
setupDirectories, } from "@dokploy/server/dist/setup/traefik-setup";
} from "@dokploy/server";
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 () => { (async () => {
try { try {
setupDirectories(); setupDirectories();

38
packages/server/src/db/reset.ts
View File

@@ -1,23 +1,23 @@
// import { sql } from "drizzle-orm"; import { sql } from "drizzle-orm";
// // Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406 // Credits to Louistiti from Drizzle Discord: https://discord.com/channels/1043890932593987624/1130802621750448160/1143083373535973406
// import { drizzle } from "drizzle-orm/postgres-js"; import { drizzle } from "drizzle-orm/postgres-js";
// import postgres from "postgres"; import postgres from "postgres";
// const connectionString = process.env.DATABASE_URL || ""; const connectionString = process.env.DATABASE_URL || "";
// const pg = postgres(connectionString, { max: 1 }); const pg = postgres(connectionString, { max: 1 });
// const db = drizzle(pg); const db = drizzle(pg);
// const clearDb = async (): Promise<void> => { const clearDb = async (): Promise<void> => {
// try { try {
// const tablesQuery = sql<string>`DROP SCHEMA public CASCADE; CREATE SCHEMA public; DROP schema drizzle CASCADE;`; const tablesQuery = sql<string>`DROP SCHEMA public CASCADE; CREATE SCHEMA public; DROP schema drizzle CASCADE;`;
// const tables = await db.execute(tablesQuery); const tables = await db.execute(tablesQuery);
// console.log(tables); console.log(tables);
// await pg.end(); await pg.end();
// } catch (error) { } catch (error) {
// console.error("Error to clean database", error); console.error("Error to clean database", error);
// } finally { } finally {
// } }
// }; };
// clearDb(); clearDb();

13
packages/server/src/utils/access-log/handler.ts
View File

@@ -1,7 +1,8 @@
import { IS_CLOUD, paths } from "@/server/constants"; 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 { type RotatingFileStream, createStream } from "rotating-file-stream";
import { execAsync } from "../process/execAsync"; import { execAsync } from "../process/execAsync";
import { db } from "../../db";
class LogRotationManager { class LogRotationManager {
private static instance: LogRotationManager; private static instance: LogRotationManager;
@@ -29,13 +30,17 @@ class LogRotationManager {
} }
private async getStateFromDB(): Promise<boolean> { private async getStateFromDB(): Promise<boolean> {
const setting = await findAdmin(); const setting = await db.query.admins.findFirst({});
return setting?.enableLogRotation ?? false; return setting?.enableLogRotation ?? false;
} }
private async setStateInDB(active: boolean): Promise<void> { private async setStateInDB(active: boolean): Promise<void> {
const admin = await findAdmin(); const admin = await db.query.admins.findFirst({});
await updateAdmin(admin.authId, {
if (!admin) {
return;
}
await updateAdmin(admin?.authId, {
enableLogRotation: active, enableLogRotation: active,
}); });
} }