GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-02-01 10:31:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "进一步的 kvmd 国际化（汉化）支持"

Browse Source 
This reverts commit 5b25b3661f.
This commit is contained in:
mofeng-git
2024-11-20 11:51:52 +00:00
parent b419641251
commit 433232c845
11 changed files with 90 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kvmd/aioproc.py
View File

@@ -26,7 +26,6 @@ import asyncio
import asyncio.subprocess
import logging
from .lanuages import Lanuages
import setproctitle
from .logging import get_logger
@@ -86,7 +85,7 @@ async def log_stdout_infinite(proc: asyncio.subprocess.Process, logger: logging.
else:
empty += 1
if empty == 100: # asyncio bug
raise RuntimeError(Lanuages().gettext("Asyncio process: too many empty lines"))
raise RuntimeError("Asyncio process: too many empty lines")
async def kill_process(proc: asyncio.subprocess.Process, wait: float, logger: logging.Logger) -> None: # pylint: disable=no-member
@@ -101,14 +100,14 @@ async def kill_process(proc: asyncio.subprocess.Process, wait: float, logger: lo
if proc.returncode is not None:
raise
await proc.wait()
logger.info(Lanuages().gettext("Process killed: retcode=%d"), proc.returncode)
logger.info("Process killed: retcode=%d", proc.returncode)
except asyncio.CancelledError:
pass
except Exception:
if proc.returncode is None:
logger.exception(Lanuages().gettext("Can't kill process pid=%d"), proc.pid)
logger.exception("Can't kill process pid=%d", proc.pid)
else:
logger.info(Lanuages().gettext("Process killed: retcode=%d"), proc.returncode)
logger.info("Process killed: retcode=%d", proc.returncode)
def rename_process(suffix: str, prefix: str="kvmd") -> None:
@@ -117,7 +116,7 @@ def rename_process(suffix: str, prefix: str="kvmd") -> None:
def settle(name: str, suffix: str, prefix: str="kvmd") -> logging.Logger:
logger = get_logger(1)
logger.info(Lanuages().gettext("Started %s pid=%d"), name, os.getpid())
logger.info("Started %s pid=%d", name, os.getpid())
os.setpgrp()
rename_process(suffix, prefix)
return logger