From 4c3b2b516ed5bfb168cd89c09f3fd98ec90896b0 Mon Sep 17 00:00:00 2001 From: thsrite Date: Tue, 2 Apr 2024 12:59:31 +0800 Subject: [PATCH] fix bug --- plugins/customcommand/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/customcommand/__init__.py b/plugins/customcommand/__init__.py index 4014789..55ddf06 100644 --- a/plugins/customcommand/__init__.py +++ b/plugins/customcommand/__init__.py @@ -112,13 +112,6 @@ class CustomCommand(_PluginBase): last_output = None last_error = None while True: - output = result.stdout.readline().decode("utf-8") - if output == '' and result.poll() is not None: - break - if output: - logger.info(output.strip()) - last_output = output.strip() - error = result.stderr.readline().decode("utf-8") if error == '' and result.poll() is not None: break @@ -126,6 +119,13 @@ class CustomCommand(_PluginBase): logger.info(error.strip()) last_error = error.strip() + output = result.stdout.readline().decode("utf-8") + if output == '' and result.poll() is not None: + break + if output: + logger.info(output.strip()) + last_output = output.strip() + logger.info( f"执行命令：{command} {'成功' if result.returncode == 0 else '失败'} 返回值：{last_output if last_output else last_error}")