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

chore: cleans up urls for levels (#3314)

Browse Source
This commit is contained in:
Amir Raminfar
2024-10-04 15:22:19 -07:00
committed by GitHub
parent 049214d529
commit 423e4e11a3
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
assets/composable/eventStreams.ts
View File

@@ -107,20 +107,17 @@ function useLogStream(url: Ref<string>, loadMoreUrl?: Ref<string>) {
const { streamConfig, hasComplexLogs, levels } = useLoggingContext();
const params = computed(() => {
const params = Object.entries(toValue(streamConfig))
.filter(([, value]) => value)
.reduce((acc, [key]) => ({ ...acc, [key]: "1" }), {} as Record<string, string>);
if (isSearching.value) {
params["filter"] = debouncedSearchFilter.value;
const params = new URLSearchParams();
if (streamConfig.value.stdout) params.append("stdout", "1");
if (streamConfig.value.stderr) params.append("stderr", "1");
if (isSearching.value) params.append("filter", debouncedSearchFilter.value);
for (const level of levels.value) {
params.append("levels", level);
}
params["levels"] = [...levels.value].join(",");
return params;
});
const urlWithParams = computed(() => withBase(`${url.value}?${new URLSearchParams(params.value).toString()}`));
const urlWithParams = computed(() => withBase(`${url.value}?${params.value.toString()}`));
function connect({ clear } = { clear: true }) {
close();
@@ -172,10 +169,14 @@ function useLogStream(url: Ref<string>, loadMoreUrl?: Ref<string>) {
const signal = abortController.signal;
isLoadingMore.value = true;
try {
const moreParams = { ...params.value, from: from.toISOString(), to: to.toISOString(), minimum: "100" };
const urlWithMoreParams = computed(() =>
withBase(`${loadMoreUrl.value}?${new URLSearchParams(moreParams).toString()}`),
);
const urlWithMoreParams = computed(() => {
const loadMoreParams = new URLSearchParams(params.value);
loadMoreParams.append("from", from.toISOString());
loadMoreParams.append("to", to.toISOString());
loadMoreParams.append("minimum", "100");
return withBase(`${loadMoreUrl.value}?${loadMoreParams.toString()}`);
});
const stopWatcher = watchOnce(urlWithMoreParams, () => abortController.abort("stream changed"));
const logs = await (await fetch(urlWithMoreParams.value, { signal })).text();
stopWatcher();

4
internal/web/logs.go
View File

@@ -143,7 +143,7 @@ func (h *handler) fetchLogsBetweenDates(w http.ResponseWriter, r *http.Request)
levels := make(map[string]struct{})
if r.URL.Query().Has("levels") {
for _, level := range strings.Split(r.URL.Query().Get("levels"), ",") {
for _, level := range r.URL.Query()["levels"] {
levels[level] = struct{}{}
}
} else {
@@ -288,7 +288,7 @@ func streamLogsForContainers(w http.ResponseWriter, r *http.Request, multiHostCl
levels := make(map[string]struct{})
if r.URL.Query().Has("levels") {
for _, level := range strings.Split(r.URL.Query().Get("levels"), ",") {
for _, level := range r.URL.Query()["levels"] {
levels[level] = struct{}{}
}
} else {