From e644380b646c25e6884f9a6f334b553cc36faee8 Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 13 Jun 2022 16:06:36 -0400 Subject: [PATCH 1/2] Allow users with capital letter to reset password --- app/classes/shared/command.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/classes/shared/command.py b/app/classes/shared/command.py index 21a33c5b..1ba794a3 100644 --- a/app/classes/shared/command.py +++ b/app/classes/shared/command.py @@ -60,14 +60,16 @@ class MainPrompt(cmd.Cmd): def do_set_passwd(self, line): try: - username = str(line).lower() + username = line # If no user is found it returns None user_id = self.controller.users.get_id_by_name(username) if not username: Console.error("You must enter a username. Ex: `set_passwd admin'") return False if not user_id: - Console.error(f"No user found by the name of {username}") + Console.error( + f"No user found by the name of {username} this is case sensitive" + ) return False except: Console.error(f"User: {line} Not Found") From 55f7ab1d35e5451b01ade9b4b1715b7b929a5f4b Mon Sep 17 00:00:00 2001 From: amcmanu3 Date: Mon, 13 Jun 2022 16:13:18 -0400 Subject: [PATCH 2/2] Fix traceback on crash detection startup --- app/classes/shared/server.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py index 0121db7f..d69f2fa4 100644 --- a/app/classes/shared/server.py +++ b/app/classes/shared/server.py @@ -541,9 +541,12 @@ class ServerInstance: f"Server {self.name} has crash detection enabled " "- starting watcher task" ) - self.server_scheduler.add_job( - self.detect_crash, "interval", seconds=30, id=f"c_{self.server_id}" - ) + try: + self.server_scheduler.add_job( + self.detect_crash, "interval", seconds=30, id=f"c_{self.server_id}" + ) + except: + logger.info(f"Job with id c_{self.server_id} already running...") def stop_threaded_server(self): self.stop_server()