Skip to content
This repository was archived by the owner on Mar 25, 2025. It is now read-only.

Commit b295c24

Browse files
committed
always have pid in command
1 parent 8577f4a commit b295c24

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

src/java_toolkit/main.py

+6-10
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,11 @@
99
app = typer.Typer()
1010

1111

12-
def run_jdk_cmd(pid: int, cmd_missing_jdk_path:str, add_local_pid: bool, verbose: bool):
12+
def run_jdk_cmd_on_pid(pid: int, cmd_missing_jdk_path_and_pid: str, verbose: bool):
1313
with TmpRemotePodMounter(pid, JDK_PATH, LOCAL_MOUNT_PATH, verbose) as jdk_mounter:
14-
cmd = cmd_missing_jdk_path
15-
if add_local_pid:
16-
local_pid = get_nspid(pid, verbose)
17-
cmd = cmd.format(jdk_path=jdk_mounter.get_mounted_jdk_dir(),pid=local_pid)
18-
else:
19-
cmd = cmd.format(jdk_path=jdk_mounter.get_mounted_jdk_dir())
20-
output = run_cmd_in_proc_namespace(pid, cmd, verbose)
14+
local_pid = get_nspid(pid, verbose)
15+
cmd = cmd_missing_jdk_path_and_pid.format(jdk_path=jdk_mounter.get_mounted_jdk_dir(), pid=local_pid)
16+
output = run_cmd_in_proc_namespace(pid, cmd, verbose)
2117
typer.echo(output)
2218

2319

@@ -28,12 +24,12 @@ def pod_ps(pod_uid: str):
2824

2925
@app.command()
3026
def jmap(pid: int, verbose: bool = False):
31-
run_jdk_cmd(pid, JMAP_CMD, add_local_pid=True, verbose=verbose)
27+
run_jdk_cmd_on_pid(pid, JMAP_CMD, verbose=verbose)
3228

3329

3430
@app.command()
3531
def jstack(pid: int, verbose: bool = False):
36-
run_jdk_cmd(pid, JSTACK_CMD, add_local_pid=True, verbose=verbose)
32+
run_jdk_cmd_on_pid(pid, JSTACK_CMD, verbose=verbose)
3733

3834

3935
if __name__ == "__main__":

0 commit comments

Comments
 (0)