From c3144a6742e52be330ea12f82a741ca2f584d3d5 Mon Sep 17 00:00:00 2001 From: Richard Neumann Date: Tue, 22 Dec 2020 13:55:08 +0100 Subject: [PATCH] Added Request ID mismatch check to rconshell. --- rcon/rconclt.py | 2 +- rcon/rconshell.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rcon/rconclt.py b/rcon/rconclt.py index 60f5a75..fe98e36 100644 --- a/rcon/rconclt.py +++ b/rcon/rconclt.py @@ -22,7 +22,7 @@ ERRORS = ( (ConnectionRefusedError, 'Connection refused.', 3), (timeout, 'Connection timeout.', 4), (RequestIdMismatch, 'Unexpected request ID mismatch.', 5), - (WrongPassword, 'Wrong password.', 6), + (WrongPassword, 'Wrong password.', 6) ) LOGGER = getLogger('rconclt') diff --git a/rcon/rconshell.py b/rcon/rconshell.py index 957b87b..d84b60b 100644 --- a/rcon/rconshell.py +++ b/rcon/rconshell.py @@ -7,6 +7,7 @@ from socket import timeout from sys import exit # pylint: disable=W0622 from rcon.errorhandler import ErrorHandler +from rcon.exceptions import RequestIdMismatch from rcon.rconclt import get_credentials from rcon.config import CONFIG_FILE, LOG_FORMAT from rcon.console import PROMPT, rconcmd @@ -16,7 +17,8 @@ __all__ = ['get_args', 'main'] ERRORS = ( (ConnectionRefusedError, 'Connection refused.', 3), - (timeout, 'Connection timeout.', 4) + (timeout, 'Connection timeout.', 4), + (RequestIdMismatch, 'Unexpected request ID mismatch.', 5) ) LOGGER = getLogger('rconshell')