fix: Application logs

This commit is contained in:
Andras Bacsai
2022-04-20 09:23:06 +02:00
parent 3ab6a231eb
commit b46566280d
3 changed files with 21 additions and 14 deletions

View File

@@ -63,7 +63,7 @@
"@iarna/toml": "2.2.5", "@iarna/toml": "2.2.5",
"@prisma/client": "3.11.1", "@prisma/client": "3.11.1",
"@sentry/node": "6.19.6", "@sentry/node": "6.19.6",
"bcryptjs": "^2.4.3", "bcryptjs": "2.4.3",
"bullmq": "1.80.0", "bullmq": "1.80.0",
"compare-versions": "4.1.3", "compare-versions": "4.1.3",
"cookie": "0.4.2", "cookie": "0.4.2",

18
pnpm-lock.yaml generated
View File

@@ -5,7 +5,7 @@ specifiers:
'@prisma/client': 3.11.1 '@prisma/client': 3.11.1
'@sentry/node': 6.19.6 '@sentry/node': 6.19.6
'@sveltejs/adapter-node': 1.0.0-next.73 '@sveltejs/adapter-node': 1.0.0-next.73
'@sveltejs/kit': 1.0.0-next.303 '@sveltejs/kit': 1.0.0-next.310
'@types/js-cookie': 3.0.1 '@types/js-cookie': 3.0.1
'@types/js-yaml': 4.0.5 '@types/js-yaml': 4.0.5
'@types/node': 17.0.23 '@types/node': 17.0.23
@@ -14,8 +14,8 @@ specifiers:
'@typescript-eslint/parser': 4.31.1 '@typescript-eslint/parser': 4.31.1
'@zerodevx/svelte-toast': 0.7.1 '@zerodevx/svelte-toast': 0.7.1
autoprefixer: 10.4.4 autoprefixer: 10.4.4
bcryptjs: ^2.4.3 bcryptjs: 2.4.3
bullmq: 1.78.1 bullmq: 1.80.0
compare-versions: 4.1.3 compare-versions: 4.1.3
cookie: 0.4.2 cookie: 0.4.2
cross-env: 7.0.3 cross-env: 7.0.3
@@ -60,7 +60,7 @@ dependencies:
'@prisma/client': 3.11.1_prisma@3.11.1 '@prisma/client': 3.11.1_prisma@3.11.1
'@sentry/node': 6.19.6 '@sentry/node': 6.19.6
bcryptjs: 2.4.3 bcryptjs: 2.4.3
bullmq: 1.78.1 bullmq: 1.80.0
compare-versions: 4.1.3 compare-versions: 4.1.3
cookie: 0.4.2 cookie: 0.4.2
cuid: 2.1.8 cuid: 2.1.8
@@ -82,7 +82,7 @@ dependencies:
devDependencies: devDependencies:
'@sveltejs/adapter-node': 1.0.0-next.73 '@sveltejs/adapter-node': 1.0.0-next.73
'@sveltejs/kit': 1.0.0-next.303_svelte@3.47.0 '@sveltejs/kit': 1.0.0-next.310_svelte@3.47.0
'@types/js-cookie': 3.0.1 '@types/js-cookie': 3.0.1
'@types/js-yaml': 4.0.5 '@types/js-yaml': 4.0.5
'@types/node': 17.0.23 '@types/node': 17.0.23
@@ -374,10 +374,10 @@ packages:
tiny-glob: 0.2.9 tiny-glob: 0.2.9
dev: true dev: true
/@sveltejs/kit/1.0.0-next.303_svelte@3.47.0: /@sveltejs/kit/1.0.0-next.310_svelte@3.47.0:
resolution: resolution:
{ {
integrity: sha512-WdxDc8OiF1WEd/bEza7CBdzA+3qIcCi1GKBj/gieKX9I3N8iDJt/Cg2POrLo9wQoJ47nZcAd1eOhfr7XEX1aIQ== integrity: sha512-pTyMyaoyHS+V5cQZIQMfQXmLkhw1VaRwT9avOSgwDc0QBpnNw2LdzwoPYsUr96ca5B6cfT3SMUNolxErTNHmPQ==
} }
engines: { node: '>=14.13' } engines: { node: '>=14.13' }
hasBin: true hasBin: true
@@ -1669,10 +1669,10 @@ packages:
ieee754: 1.2.1 ieee754: 1.2.1
dev: false dev: false
/bullmq/1.78.1: /bullmq/1.80.0:
resolution: resolution:
{ {
integrity: sha512-er45mM8nGhgA83EVCJ4PNxPyDSzakvoxeFGU4vdSgYeB+SbeFQAlJYmAC50Ms7YFPstm1LeinbVZ+oX/BmBzOg== integrity: sha512-oz7GZIg7gAGIIlLQ3KdpYSA5WSz5205pQHyGwOtQof9MmkOf+Kmo6sxqr+BiQrjhFOrB6JLSCqS3EGEbMA34MA==
} }
dependencies: dependencies:
cron-parser: 4.2.1 cron-parser: 4.2.1

View File

@@ -28,7 +28,9 @@
import { errorNotification } from '$lib/form'; import { errorNotification } from '$lib/form';
let loadLogsInterval = null; let loadLogsInterval = null;
let allLogs = []; let allLogs = {
logs: []
};
let logs = []; let logs = [];
let currentPage = 1; let currentPage = 1;
let endOfLogs = false; let endOfLogs = false;
@@ -49,9 +51,12 @@
}); });
async function loadAllLogs() { async function loadAllLogs() {
try { try {
const data = await get(`/applications/${id}/logs.json`); const data: any = await get(`/applications/${id}/logs.json`);
allLogs = data.logs; allLogs = data.logs;
logs = data.logs.slice(0, 100); logs = data.logs.slice(0, 100);
if (logs.length < 100) {
endOfLogs = true;
}
return; return;
} catch ({ error }) { } catch ({ error }) {
return errorNotification(error); return errorNotification(error);
@@ -183,7 +188,8 @@
on:click={loadOlderLogs} on:click={loadOlderLogs}
class:text-coolgray-100={endOfLogs} class:text-coolgray-100={endOfLogs}
class:hover:bg-coolgray-400={!endOfLogs} class:hover:bg-coolgray-400={!endOfLogs}
class="bg-transparent" class="bg-transparent tooltip-bottom"
data-tooltip="Older logs"
disabled={endOfLogs} disabled={endOfLogs}
> >
<svg <svg
@@ -206,7 +212,8 @@
on:click={loadNewerLogs} on:click={loadNewerLogs}
class:text-coolgray-100={startOfLogs} class:text-coolgray-100={startOfLogs}
class:hover:bg-coolgray-400={!startOfLogs} class:hover:bg-coolgray-400={!startOfLogs}
class="bg-transparent" class="bg-transparent tooltip-bottom"
data-tooltip="Newer logs"
disabled={startOfLogs} disabled={startOfLogs}
> >
<svg <svg