fix(Log): server log is not display in windows (#1764)
Signed-off-by: James <james@jan.ai> Co-authored-by: James <james@jan.ai>
This commit is contained in:
parent
1b49c76ea8
commit
7f55c1bed1
@ -3,19 +3,26 @@ import { useEffect, useState } from 'react'
|
|||||||
|
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
|
import { useAtomValue } from 'jotai'
|
||||||
|
|
||||||
import { useServerLog } from '@/hooks/useServerLog'
|
import { useServerLog } from '@/hooks/useServerLog'
|
||||||
|
|
||||||
|
import { serverEnabledAtom } from '@/helpers/atoms/LocalServer.atom'
|
||||||
|
|
||||||
const Logs = () => {
|
const Logs = () => {
|
||||||
const { getServerLog } = useServerLog()
|
const { getServerLog } = useServerLog()
|
||||||
|
const serverEnabled = useAtomValue(serverEnabledAtom)
|
||||||
const [logs, setLogs] = useState([])
|
const [logs, setLogs] = useState([])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
getServerLog().then((log) => {
|
getServerLog().then((log) => {
|
||||||
if (typeof log?.split === 'function') setLogs(log.split(/\r?\n|\r|\n/g))
|
if (typeof log?.split === 'function') {
|
||||||
|
setLogs(log.split(/\r?\n|\r|\n/g))
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [logs])
|
}, [logs, serverEnabled])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="overflow-hidden">
|
<div className="overflow-hidden">
|
||||||
|
|||||||
@ -37,6 +37,19 @@ export default function SystemMonitorScreen() {
|
|||||||
<ScrollArea className="h-full w-full">
|
<ScrollArea className="h-full w-full">
|
||||||
<div className="h-full p-8" data-test-id="testid-system-monitor">
|
<div className="h-full p-8" data-test-id="testid-system-monitor">
|
||||||
<div className="grid grid-cols-2 gap-8 lg:grid-cols-3">
|
<div className="grid grid-cols-2 gap-8 lg:grid-cols-3">
|
||||||
|
<div className="rounded-xl border border-border p-4">
|
||||||
|
<div className="flex items-center justify-between">
|
||||||
|
<h4 className="text-base font-bold uppercase">
|
||||||
|
cpu ({cpuUsage}%)
|
||||||
|
</h4>
|
||||||
|
<span className="text-xs text-muted-foreground">
|
||||||
|
{cpuUsage}% of 100%
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div className="mt-2">
|
||||||
|
<Progress className="mb-2 h-10 rounded-md" value={cpuUsage} />
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div className="rounded-xl border border-border p-4">
|
<div className="rounded-xl border border-border p-4">
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<h4 className="text-base font-bold uppercase">
|
<h4 className="text-base font-bold uppercase">
|
||||||
@ -53,19 +66,6 @@ export default function SystemMonitorScreen() {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="rounded-xl border border-border p-4">
|
|
||||||
<div className="flex items-center justify-between">
|
|
||||||
<h4 className="text-base font-bold uppercase">
|
|
||||||
cpu ({cpuUsage}%)
|
|
||||||
</h4>
|
|
||||||
<span className="text-xs text-muted-foreground">
|
|
||||||
{cpuUsage}% of 100%
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
<div className="mt-2">
|
|
||||||
<Progress className="mb-2 h-10 rounded-md" value={cpuUsage} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{activeModel && (
|
{activeModel && (
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user