mirrors/dozzle
1
0
Fork 0
mirror of https://github.com/amir20/dozzle.git synced 2025-12-24 06:28:42 +01:00
Code Issues Projects Releases Wiki Activity

fix: shows container and host name correctly for events. (#3494)

Browse Source
This commit is contained in:
Amir Raminfar
2024-12-31 09:07:52 -08:00
committed by GitHub
parent f4f61a6a75
commit 65ef1d3c68
2 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
assets/components/LogViewer/ContainerEventLogItem.vue
View File

@@ -1,29 +1,25 @@
<template> <template>
<div class="flex w-full flex-col"> <LogItem :logEntry>
<div class="relative flex items-start gap-x-2"> <div class="whitespace-pre-wrap" :data-event="logEntry.event" v-html="logEntry.message"></div>
<RandomColorTag class="flex-none" :value="container.name" v-if="showContainerName" /> </LogItem>
<LogDate :date="logEntry.date" v-if="showTimestamp" />
<LogLevel class="flex" /> <div class="alert alert-info my-4 w-auto flex-none font-sans text-[1rem] md:mx-auto md:w-1/2" v-if="followEligible">
<div class="whitespace-pre-wrap" :data-event="logEntry.event" v-html="logEntry.message"></div> <carbon:information class="size-6 shrink-0 stroke-current" />
<div>
<h3 class="text-lg font-bold">{{ $t("alert.similar-container-found.title") }}</h3>
{{ $t("alert.similar-container-found.message", { containerId: nextContainer.id }) }}
</div> </div>
<div class="alert alert-info mt-8 w-auto flex-none font-sans text-[1rem] md:mx-auto md:w-1/2" v-if="followEligible"> <div>
<carbon:information class="size-6 shrink-0 stroke-current" /> <TimedButton v-if="automaticRedirect" class="btn-primary btn-sm" @finished="redirectNow()">{{
<div> $t("button.cancel")
<h3 class="text-lg font-bold">{{ $t("alert.similar-container-found.title") }}</h3> }}</TimedButton>
{{ $t("alert.similar-container-found.message", { containerId: nextContainer.id }) }} <router-link
</div> :to="{ name: '/container/[id]', params: { id: nextContainer.id } }"
<div> class="btn btn-primary btn-sm"
<TimedButton v-if="automaticRedirect" class="btn-primary btn-sm" @finished="redirectNow()">{{ v-else
$t("button.cancel") >
}}</TimedButton> {{ $t("button.redirect") }}
<router-link </router-link>
:to="{ name: '/container/[id]', params: { id: nextContainer.id } }"
class="btn btn-primary btn-sm"
v-else
>
{{ $t("button.redirect") }}
</router-link>
</div>
</div> </div>
</div> </div>
</template> </template>

2
assets/models/LogEntry.ts
View File

@@ -135,7 +135,7 @@ export class ContainerEventLogEntry extends LogEntry<string> {
date: Date, date: Date,
public readonly event: "container-stopped" | "container-started", public readonly event: "container-stopped" | "container-started",
) { ) {
super(message, containerID, date.getTime(), date, "stderr", "info"); super(message, containerID, date.getTime(), date, "stderr", "unknown");
} }
getComponent(): Component { getComponent(): Component {
return ContainerEventLogItem; return ContainerEventLogItem;