Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add a log viewer that opens in a modal window when the "Show logs" button in the upper right corner of the screen is clicked. The log viewer is currently hardcoded to follow /tmp/anaconda.log.
- Loading branch information
Showing
5 changed files
with
156 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /* | ||
| * Copyright (C) 2022 Red Hat, Inc. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation; either version 2.1 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with This program; If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| import cockpit from "cockpit"; | ||
|
|
||
| import React, { useEffect, useState } from "react"; | ||
|
|
||
| import { LogViewer, LogViewerSearch } from "@patternfly/react-log-viewer"; | ||
|
|
||
| import { watchLogFile } from "../helpers/logs.js"; | ||
|
|
||
| import { | ||
| Button, | ||
| Modal, ModalVariant, | ||
| Toolbar, ToolbarContent, ToolbarItem, | ||
| Text, TextContent, TextVariants, | ||
| Flex, | ||
| } from "@patternfly/react-core"; | ||
|
|
||
| const _ = cockpit.gettext; | ||
|
|
||
| export const AnacondaLogViewer = () => { | ||
| const [logData, setLogData] = useState(""); | ||
|
|
||
| useEffect(() => { | ||
| const appendLogData = (newLogData, dataTag, error) => { | ||
| setLogData(logData + newLogData); | ||
| if (error) { | ||
| console.log("Log file read failed."); | ||
| console.log(error); | ||
| } | ||
| }; | ||
| watchLogFile("/tmp/anaconda.log", appendLogData); | ||
| // TODO: find another way to run this only once without | ||
| // the need to disable eslint warnings | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
|
|
||
| return ( | ||
| <LogViewer | ||
| // TODO: find why line numbers are corrupted when displayed | ||
| hasLineNumbers={false} | ||
| isTextWrapped={false} | ||
| height={600} | ||
| data={logData} | ||
| toolbar={ | ||
| <Toolbar> | ||
| <ToolbarContent> | ||
| <ToolbarItem> | ||
| <LogViewerSearch placeholder="Search value" /> | ||
| </ToolbarItem> | ||
| </ToolbarContent> | ||
| </Toolbar> | ||
| } | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export const LogViewerModal = ({ setShowLogViewer }) => { | ||
| return ( | ||
| <Modal | ||
| id="log-viewer-modal" | ||
| actions={[ | ||
| <Button | ||
| id="log-viewer-exit-btn" | ||
| key="cancel" | ||
| onClick={() => { | ||
| setShowLogViewer(false); | ||
| }} | ||
| variant="secondary"> | ||
| {_("Close")} | ||
| </Button> | ||
| ]} | ||
| isOpen | ||
| onClose={() => setShowLogViewer(false)} | ||
| title={_("Installer logs")} | ||
| variant={ModalVariant.medium} | ||
| > | ||
| <Flex direction={{ default: "column" }}> | ||
| <TextContent> | ||
| <Text component={TextVariants.p}> | ||
| {_("Installer version") + " 37.10"} | ||
| </Text> | ||
| </TextContent> | ||
| <AnacondaLogViewer /> | ||
| </Flex> | ||
| </Modal> | ||
| ); | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * Copyright (C) 2022 Red Hat, Inc. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as published by | ||
| * the Free Software Foundation; either version 2.1 of the License, or | ||
| * (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, but | ||
| * WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public License | ||
| * along with This program; If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| import cockpit from "cockpit"; | ||
|
|
||
| export const watchLogFile = (logFilePath, callback) => { | ||
| const file = cockpit.file(logFilePath); | ||
| file.watch(callback); | ||
| }; |