dandri/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2026-04-01 00:35:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix disabling migrations on nix not wirking

Browse Source
This commit is contained in:
Rory&
2026-02-04 05:07:10 +01:00
parent 6a235130d7
commit 90291eadf4
5 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nix/modules/default/default.nix
View File

@@ -272,7 +272,7 @@ in
CONFIG_READONLY = 1;
PORT = toString cfg.gatewayEndpoint.localPort;
STORAGE_LOCATION = cfg.cdnPath;
APPLY_DB_MIGRATIONS = false;
APPLY_DB_MIGRATIONS = "false";
}
);
serviceConfig = {
@@ -295,7 +295,7 @@ in
CONFIG_READONLY = 1;
PORT = toString cfg.cdnEndpoint.localPort;
STORAGE_LOCATION = cfg.cdnPath;
APPLY_DB_MIGRATIONS = false;
APPLY_DB_MIGRATIONS = "false";
}
);
serviceConfig = {

1
nix/tests/test-bundle-starts.nix
View File

@@ -58,7 +58,6 @@ in
};
testScript = ''
machine.wait_for_unit("spacebar-apply-migrations")
machine.wait_for_unit("spacebar-api")
machine.wait_for_unit("spacebar-cdn")
machine.wait_for_unit("spacebar-gateway")

6
src/gateway/util/Utils.ts
View File

@@ -53,5 +53,9 @@ export async function cleanupOnStartup(): Promise<void> {
// },
//);
await VoiceState.clear();
try {
await VoiceState.clear();
} catch (e) {
console.error("Error clearing voice states on startup:", e);
}
}

1
src/util/config/types/OffloadConfiguration.ts
View File

@@ -21,5 +21,6 @@ export class OffloadConfiguration {
}
export class GatewayOffloadConfiguration {
op12BaseUrl: string | null = null;
op14BaseUrl: string | null = null;
}

36
src/util/util/Database.ts
View File

@@ -20,7 +20,9 @@ import { config } from "dotenv";
import path from "path";
import { green, red, yellow } from "picocolors";
import { DataSource } from "typeorm";
// noinspection ES6PreferShortImport
import { ConfigEntity } from "../entities/Config";
// noinspection ES6PreferShortImport
import { Migration } from "../entities/Migration";
import fs from "fs";
@@ -41,6 +43,7 @@ const dbConnectionString = process.env.DATABASE || path.join(process.cwd(), "dat
export const DatabaseType = dbConnectionString.includes("://") ? dbConnectionString.split(":")[0]?.replace("+srv", "") : "sqlite";
const isSqlite = DatabaseType.includes("sqlite");
const applyMigrations = process.env.APPLY_DB_MIGRATIONS !== "false";
// For openapi.js...
if (!isHeadlessProcess) {
@@ -72,7 +75,7 @@ export const DataSourceOptions = isHeadlessProcess
bigNumberStrings: false,
supportBigNumbers: true,
name: "default",
migrations: [path.join(__dirname, "..", "migration", DatabaseType, "*.js")],
migrations: applyMigrations ? [path.join(__dirname, "..", "migration", DatabaseType, "*.js")] : [],
});
// Gets the existing database connection
@@ -120,21 +123,26 @@ export async function initDatabase(): Promise<DataSource> {
return false;
}
};
if (applyMigrations) {
if (!(await dbExists())) {
console.log("[Database] This appears to be a fresh database. Running initial DDL.");
const qr = dbConnection.createQueryRunner();
const initialPath = path.join(__dirname, "..", "migration", DatabaseType + "-initial.js");
if (fs.existsSync(initialPath)) {
console.log("[Database] Found initial migration file, running it.");
await new (require(`../migration/${DatabaseType}-initial`).initial0)().up(qr);
} else console.log("[Database] No initial migration file found at '", initialPath, "', skipping.");
await qr.release();
}
if (!(await dbExists())) {
console.log("[Database] This appears to be a fresh database. Running initial DDL.");
const qr = dbConnection.createQueryRunner();
const initialPath = path.join(__dirname, "..", "migration", DatabaseType + "-initial.js");
if (fs.existsSync(initialPath)) {
console.log("[Database] Found initial migration file, running it.");
await new (require(`../migration/${DatabaseType}-initial`).initial0)().up(qr);
} else console.log("[Database] No initial migration file found at '", initialPath, "', skipping.");
await qr.release();
}
if (process.env.APPLY_DB_MIGRATIONS !== "false") {
console.log("[Database] Applying missing migrations, if any.");
console.log("[Database] Applying missing migrations, if any.", process.env.APPLY_DB_MIGRATIONS);
await dbConnection.runMigrations();
} else {
console.log("[Database] Skipping migrations as per config.");
while (!(await dbExists())) {
console.log("[Database] Database does not exist, and we are not running migrations... Waiting 1 seconds...");
await new Promise((r) => setTimeout(r, 5000));
}
}
console.log(`[Database] ${green("Connected")}`);