- Rename error handler.

- Truncate errors.
- Better error tags, release version etc.
This commit is contained in:
Andras Bacsai
2022-02-14 09:28:37 +01:00
parent 70d3448110
commit b4a418dded
95 changed files with 260 additions and 226 deletions

View File

@@ -1,6 +1,6 @@
import { asyncExecShell, getDomain, getEngine, getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -21,6 +21,6 @@ export const post: RequestHandler = async (event) => {
}
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -14,6 +14,6 @@ export const post: RequestHandler = async (event) => {
await db.configureDestinationForService({ id, destinationId });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
import { ErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const get: RequestHandler = async (event) => {
@@ -27,6 +27,6 @@ export const post: RequestHandler = async (event) => {
status: 201
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
import { ErrorHandler, supportedServiceTypesAndVersions } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const get: RequestHandler = async (event) => {
@@ -18,7 +18,7 @@ export const get: RequestHandler = async (event) => {
}
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};
@@ -35,6 +35,6 @@ export const post: RequestHandler = async (event) => {
status: 201
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const del: RequestHandler = async (events) => {
@@ -13,6 +13,6 @@ export const del: RequestHandler = async (events) => {
await db.removeService({ id });
return { status: 200 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -4,7 +4,7 @@ import {
generateDatabaseConfiguration,
getServiceImage,
getVersions,
PrismaErrorHandler
ErrorHandler
} from '$lib/database';
import { dockerInstance } from '$lib/docker';
import type { RequestHandler } from '@sveltejs/kit';
@@ -43,6 +43,6 @@ export const get: RequestHandler = async (event) => {
}
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -16,6 +16,6 @@ export const post: RequestHandler = async (event) => {
await db.updateNocoDbOrMinioService({ id, fqdn, name });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -13,7 +13,7 @@ import {
} from '$lib/haproxy';
import getPort from 'get-port';
import { getDomain } from '$lib/components/common';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -100,9 +100,9 @@ export const post: RequestHandler = async (event) => {
};
} catch (error) {
console.log(error);
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getEngine, getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff, stopTcpHttpProxy } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -41,6 +41,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const post: RequestHandler = async (event) => {
await db.updateNocoDbOrMinioService({ id, fqdn, name });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { letsEncrypt } from '$lib/letsencrypt';
import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -59,9 +59,9 @@ export const post: RequestHandler = async (event) => {
};
} catch (error) {
console.log(error);
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -34,6 +34,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import type { RequestHandler } from '@sveltejs/kit';
@@ -28,6 +28,6 @@ export const post: RequestHandler = async (event) => {
}
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -21,6 +21,6 @@ export const post: RequestHandler = async (event) => {
await db.updatePlausibleAnalyticsService({ id, fqdn, name, email, username });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { letsEncrypt } from '$lib/letsencrypt';
import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -191,6 +191,6 @@ COPY ./init-db.sh /docker-entrypoint-initdb.d/init-db.sh`;
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -44,6 +44,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const post: RequestHandler = async (event) => {
await db.updateVaultWardenService({ id, fqdn, name });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { letsEncrypt } from '$lib/letsencrypt';
import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { getServiceImage, PrismaErrorHandler } from '$lib/database';
import { getServiceImage, ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -76,9 +76,9 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -34,6 +34,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -16,6 +16,6 @@ export const post: RequestHandler = async (event) => {
await db.updateVsCodeServer({ id, fqdn, name });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { letsEncrypt } from '$lib/letsencrypt';
import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -86,9 +86,9 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -33,6 +33,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const post: RequestHandler = async (event) => {
@@ -19,6 +19,6 @@ export const post: RequestHandler = async (event) => {
await db.updateWordpress({ id, fqdn, name, extraConfig, mysqlDatabase });
return { status: 201 };
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -6,7 +6,7 @@ import type { RequestHandler } from '@sveltejs/kit';
import { letsEncrypt } from '$lib/letsencrypt';
import { configureSimpleServiceProxyOn, reloadHaproxy, setWwwRedirection } from '$lib/haproxy';
import { getDomain } from '$lib/components/common';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
export const post: RequestHandler = async (event) => {
const { teamId, status, body } = await getUserDetails(event);
@@ -124,9 +124,9 @@ export const post: RequestHandler = async (event) => {
};
} catch (error) {
console.log(error);
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,7 +1,7 @@
import { getUserDetails, removeDestinationDocker } from '$lib/common';
import { getDomain } from '$lib/components/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import { dockerInstance } from '$lib/docker';
import { checkContainer, configureSimpleServiceProxyOff } from '$lib/haproxy';
import type { RequestHandler } from '@sveltejs/kit';
@@ -37,6 +37,6 @@ export const post: RequestHandler = async (event) => {
status: 200
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};

View File

@@ -1,6 +1,6 @@
import { getUserDetails } from '$lib/common';
import * as db from '$lib/database';
import { PrismaErrorHandler } from '$lib/database';
import { ErrorHandler } from '$lib/database';
import type { RequestHandler } from '@sveltejs/kit';
export const get: RequestHandler = async (event) => {
@@ -15,6 +15,6 @@ export const get: RequestHandler = async (event) => {
}
};
} catch (error) {
return PrismaErrorHandler(error);
return ErrorHandler(error);
}
};