github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-08-08 11:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

TRA-3211 show tapping info tweaks

Browse Source 
TRA-3211 show tapping info tweaks
This commit is contained in:
RamiBerm 2021-05-25 11:20:37 +03:00 committed by GitHub
commit 74e9d44b96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/pkg/api/socket_server_handlers.go
View File

@ -65,7 +65,7 @@ func (h *RoutesEventHandlers) WebSocketMessage(ep *ikisocket.EventPayload) {
var tappedEntryMessage models.WebSocketTappedEntryMessage var tappedEntryMessage models.WebSocketTappedEntryMessage
err := json.Unmarshal(ep.Data, &tappedEntryMessage) err := json.Unmarshal(ep.Data, &tappedEntryMessage)
if err != nil { if err != nil {
fmt.Printf("Could not unmarshal message of message type %s %v", socketMessageBase.MessageType, err) fmt.Printf("Could not unmarshal message of message type %s %v\n", socketMessageBase.MessageType, err)
} else { } else {
h.SocketHarOutChannel <- tappedEntryMessage.Data h.SocketHarOutChannel <- tappedEntryMessage.Data
} }
@ -73,11 +73,13 @@ func (h *RoutesEventHandlers) WebSocketMessage(ep *ikisocket.EventPayload) {
var statusMessage shared.WebSocketStatusMessage var statusMessage shared.WebSocketStatusMessage
err := json.Unmarshal(ep.Data, &statusMessage) err := json.Unmarshal(ep.Data, &statusMessage)
if err != nil { if err != nil {
fmt.Printf("Could not unmarshal message of message type %s %v", socketMessageBase.MessageType, err) fmt.Printf("Could not unmarshal message of message type %s %v\n", socketMessageBase.MessageType, err)
} else { } else {
controllers.TapStatus = statusMessage.TappingStatus controllers.TapStatus = statusMessage.TappingStatus
broadcastToBrowserClients(ep.Data) broadcastToBrowserClients(ep.Data)
} }
default:
fmt.Printf("Received socket message of type %s for which no handlers are defined", socketMessageBase.MessageType)
} }
} }
} }

2
cli/cmd/tapRunner.go
View File

@ -211,7 +211,7 @@ func syncApiStatus(ctx context.Context, cancel context.CancelFunc, tappingOption
if err != nil { if err != nil {
fmt.Printf("error Sending message via control socket %s\n", err) fmt.Printf("error Sending message via control socket %s\n", err)
} }
time.Sleep(5 * time.Second) time.Sleep(10 * time.Second)
} }
} }

8
ui/src/components/HarPage.tsx
View File

@ -50,7 +50,7 @@ export const HarPage: React.FC = () => {
const [statusFilter, setStatusFilter] = useState([]); const [statusFilter, setStatusFilter] = useState([]);
const [pathFilter, setPathFilter] = useState(""); const [pathFilter, setPathFilter] = useState("");
const [apiStatus, setApiStatus] = useState(null); const [tappingStatus, setTappingStatus] = useState(null);
const ws = useRef(null); const ws = useRef(null);
@ -81,7 +81,7 @@ export const HarPage: React.FC = () => {
setEntries([...newEntries, entry]) setEntries([...newEntries, entry])
break break
case "status": case "status":
setApiStatus(message.tappingStatus); setTappingStatus(message.tappingStatus);
break break
default: default:
console.error(`unsupported websocket message type, Got: ${message.messageType}`) console.error(`unsupported websocket message type, Got: ${message.messageType}`)
@ -93,7 +93,7 @@ export const HarPage: React.FC = () => {
openWebSocket(); openWebSocket();
fetch(`http://localhost:8899/api/tapStatus`) fetch(`http://localhost:8899/api/tapStatus`)
.then(response => response.json()) .then(response => response.json())
.then(data => setApiStatus(data)); .then(data => setTappingStatus(data));
}, []); }, []);
@ -172,7 +172,7 @@ export const HarPage: React.FC = () => {
{selectedHarEntry && <HAREntryDetailed harEntry={selectedHarEntry} classes={{root: classes.harViewer}}/>} {selectedHarEntry && <HAREntryDetailed harEntry={selectedHarEntry} classes={{root: classes.harViewer}}/>}
</div> </div>
</div>} </div>}
{apiStatus?.pods != null && <StatusBar tappingStatus={apiStatus}/>} {tappingStatus?.pods != null && <StatusBar tappingStatus={tappingStatus}/>}
</div> </div>
) )
}; };