dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: docker log sequence

Browse Source
This commit is contained in:
Andras Bacsai
2023-01-16 10:06:41 +01:00
parent d641d32413
commit 2fd001f6d2
5 changed files with 1617 additions and 1380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/api/src/routes/api/v1/applications/handlers.ts
View File

@@ -1605,12 +1605,7 @@ export async function getApplicationLogs(request: FastifyRequest<GetApplicationL
.split('\n') .split('\n')
.map((l) => ansi(l)) .map((l) => ansi(l))
.filter((a) => a); .filter((a) => a);
const logs = stripLogsStderr.concat(stripLogsStdout); return { logs: stripLogsStderr.concat(stripLogsStdout) };
const sortedLogs = logs.sort((a, b) =>
day(a.split(' ')[0]).isAfter(day(b.split(' ')[0])) ? 1 : -1
);
return { logs: sortedLogs };
// }
} catch (error) { } catch (error) {
const { statusCode, stderr } = error; const { statusCode, stderr } = error;
if (stderr.startsWith('Error: No such container')) { if (stderr.startsWith('Error: No such container')) {

1027
apps/api/src/routes/api/v1/databases/handlers.ts
View File

File diff suppressed because it is too large Load Diff

1948
apps/api/src/routes/api/v1/services/handlers.ts
View File

File diff suppressed because it is too large Load Diff

7
apps/server/src/trpc/routers/applications/index.ts
View File

@@ -561,12 +561,7 @@ export const applicationsRouter = router({
.split('\n') .split('\n')
.map((l) => ansi(l)) .map((l) => ansi(l))
.filter((a) => a); .filter((a) => a);
const logs = stripLogsStderr.concat(stripLogsStdout); return { logs: stripLogsStderr.concat(stripLogsStdout) };
const sortedLogs = logs.sort((a, b) =>
day(a.split(' ')[0]).isAfter(day(b.split(' ')[0])) ? 1 : -1
);
return { logs: sortedLogs };
// }
} catch (error) { } catch (error) {
const { statusCode, stderr } = error; const { statusCode, stderr } = error;
if (stderr.startsWith('Error: No such container')) { if (stderr.startsWith('Error: No such container')) {

8
apps/server/src/trpc/routers/services/index.ts
View File

@@ -68,16 +68,11 @@ export const servicesRouter = router({
.split('\n') .split('\n')
.map((l) => ansi(l)) .map((l) => ansi(l))
.filter((a) => a); .filter((a) => a);
const logs = stripLogsStderr.concat(stripLogsStdout);
const sortedLogs = logs.sort((a, b) =>
day(a.split(' ')[0]).isAfter(day(b.split(' ')[0])) ? 1 : -1
);
return { return {
data: { data: {
logs: sortedLogs logs: stripLogsStderr.concat(stripLogsStdout)
} }
}; };
// }
} catch (error) { } catch (error) {
const { statusCode, stderr } = error; const { statusCode, stderr } = error;
if (stderr.startsWith('Error: No such container')) { if (stderr.startsWith('Error: No such container')) {
@@ -92,7 +87,6 @@ export const servicesRouter = router({
return { return {
data: { data: {
logs: [] logs: []
} }
}; };
} }