GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 09:10:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

prefix for log_process()

Browse Source
This commit is contained in:
Maxim Devaev 2021-10-24 12:02:36 +03:00
parent 434acc5de5
commit b6aaf18c42
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kvmd/aioproc.py
View File

@ -67,13 +67,16 @@ async def log_process(
cmd: List[str], cmd: List[str],
logger: logging.Logger, logger: logging.Logger,
env: Optional[Dict[str, str]]=None, env: Optional[Dict[str, str]]=None,
prefix: str="",
) -> asyncio.subprocess.Process: # pylint: disable=no-member ) -> asyncio.subprocess.Process: # pylint: disable=no-member
(proc, stdout) = await read_process(cmd, env=env) (proc, stdout) = await read_process(cmd, env=env)
if stdout: if stdout:
log = (logger.info if proc.returncode == 0 else logger.error) log = (logger.info if proc.returncode == 0 else logger.error)
if prefix:
prefix += " "
for line in stdout.split("\n"): for line in stdout.split("\n"):
log("=> %s", line) log("%s=> %s", prefix, line)
return proc return proc

2
kvmd/plugins/ugpio/cmd.py
View File

@ -79,7 +79,7 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
return return
try: try:
proc = await aioproc.log_process(self.__cmd, logger=get_logger(0)) proc = await aioproc.log_process(self.__cmd, logger=get_logger(0), prefix=str(self))
if proc.returncode != 0: if proc.returncode != 0:
raise RuntimeError(f"Custom command error: pid={proc.pid}; retcode={proc.returncode}") raise RuntimeError(f"Custom command error: pid={proc.pid}; retcode={proc.returncode}")
except Exception as err: except Exception as err:

2
kvmd/plugins/ugpio/ipmi.py
View File

@ -153,7 +153,7 @@ class Plugin(BaseUserGpioDriver): # pylint: disable=too-many-instance-attribute
return return
action = (_OUTPUTS[pin] if pin.isdigit() else pin) action = (_OUTPUTS[pin] if pin.isdigit() else pin)
try: try:
proc = await aioproc.log_process(**self.__make_ipmitool_kwargs(action), logger=get_logger(0)) proc = await aioproc.log_process(**self.__make_ipmitool_kwargs(action), logger=get_logger(0), prefix=str(self))
if proc.returncode != 0: if proc.returncode != 0:
raise RuntimeError(f"Ipmitool error: pid={proc.pid}; retcode={proc.returncode}") raise RuntimeError(f"Ipmitool error: pid={proc.pid}; retcode={proc.returncode}")
except Exception as err: except Exception as err: