diff --git a/dislocker.py b/dislocker.py index 0d819bc..8b9373a 100644 --- a/dislocker.py +++ b/dislocker.py @@ -679,8 +679,6 @@ class Monitor(): pc_list = cursor.fetchall() current_datetime = datetime.now() fstop_time = self.fstop_time - print(pc_list) - print(len(pc_list)) if current_datetime.time().strftime("%H:%M:%S") == fstop_time: for i in dislocker.pc_list: stop = bot.force_stop(pc_number=i, bot_about="使用停止忘れによるBotによる強制停止。") @@ -704,9 +702,9 @@ class Monitor(): stop = bot.stop(user_id=user_info[0][3], bot_about="パスワードのタイムアウトでBotによる強制停止。") bot.timeout_notify(pc_number=pc_list[0][0], discord_display_name=user_info[0][1]) - result = {"result": "STOP"} + result = {"result": "STOP", "details": str(pc_usage)} else: - result = {"result": "BUT SAFE"} + result = {"result": "BUT SAFE", "details": str(pc_usage)} elif len(pc_list) >= 2: @@ -727,9 +725,9 @@ class Monitor(): stop = bot.stop(user_id=user_info[0][3], bot_about="タイムアウトでBotによる強制停止。") bot.timeout_notify(pc_number=i[0], discord_display_name=user_info[0][1]) - result = {"result": "STOP"} + result = {"result": "STOP", "details": str(pc_usage)} else: - result = {"result": "BUT SAFE"} + result = {"result": "BUT SAFE", "details": str(pc_usage)} else: result = {"result": "NONE"}