hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4271 from lensapp/port-forward-logging

Browse Source 
cleaned up logging from port-forward-store
This commit is contained in:
Jim Ehrismann 2021-11-05 14:23:05 -04:00 committed by GitHub
commit e086af4b40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/renderer/port-forward/port-forward.store.ts
View File

@ -47,7 +47,7 @@ export class PortForwardStore extends ItemStore<PortForwardItem> {
const savedPortForwards = this.storage.get(); // undefined on first load const savedPortForwards = this.storage.get(); // undefined on first load
if (Array.isArray(savedPortForwards)) { if (Array.isArray(savedPortForwards)) {
logger.info("[PORT_FORWARD] starting saved port-forwards"); logger.info("[PORT-FORWARD-STORE] starting saved port-forwards");
await Promise.all(savedPortForwards.map(addPortForward)); await Promise.all(savedPortForwards.map(addPortForward));
} }
} }
@ -108,11 +108,12 @@ export async function addPortForward(portForward: ForwardedPort): Promise<number
response = await apiBase.post<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}&protocol=${protocol}`); response = await apiBase.post<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}&protocol=${protocol}`);
if (response?.port && response.port != +portForward.forwardPort) { // expecting the received port to be the specified port, unless the specified port is 0, which indicates any available port is suitable
logger.warn(`specified ${portForward.forwardPort} got ${response.port}`); if (portForward.forwardPort && response?.port && response.port != +portForward.forwardPort) {
logger.warn(`[PORT-FORWARD-STORE] specified ${portForward.forwardPort} got ${response.port}`);
} }
} catch (error) { } catch (error) {
logger.warn("Error adding port-forward:", error, portForward); logger.warn("[PORT-FORWARD-STORE] Error adding port-forward:", error, portForward);
throw(error); throw(error);
} }
portForwardStore.reset(); portForwardStore.reset();
@ -134,7 +135,7 @@ export async function getPortForward(portForward: ForwardedPort): Promise<number
try { try {
response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}${getProtocolQuery(portForward.protocol)}`); response = await apiBase.get<PortForwardResult>(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}${getProtocolQuery(portForward.protocol)}`);
} catch (error) { } catch (error) {
logger.warn("Error getting port-forward:", error, portForward); logger.warn("[PORT-FORWARD-STORE] Error getting port-forward:", error, portForward);
throw(error); throw(error);
} }
@ -159,7 +160,7 @@ export async function removePortForward(portForward: ForwardedPort) {
await apiBase.del(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}`); await apiBase.del(`/pods/port-forward/${portForward.namespace}/${portForward.kind}/${portForward.name}?port=${portForward.port}&forwardPort=${portForward.forwardPort}`);
await waitUntilFree(+portForward.forwardPort, 200, 1000); await waitUntilFree(+portForward.forwardPort, 200, 1000);
} catch (error) { } catch (error) {
logger.warn("Error removing port-forward:", error, portForward); logger.warn("[PORT-FORWARD-STORE] Error removing port-forward:", error, portForward);
throw(error); throw(error);
} }
portForwardStore.reset(); portForwardStore.reset();
@ -171,7 +172,7 @@ export async function getPortForwards(): Promise<ForwardedPort[]> {
return response.portForwards; return response.portForwards;
} catch (error) { } catch (error) {
logger.warn("Error getting all port-forwards:", error); logger.warn("[PORT-FORWARD-STORE] Error getting all port-forwards:", error);
return []; return [];
} }