From 5fef69d697f51da3372426a4b9b414ca0c29a38c Mon Sep 17 00:00:00 2001 From: RaidMax Date: Sat, 10 Aug 2019 17:58:20 -0500 Subject: [PATCH 1/2] slight tweak to log reader to expire old keys --- GameLogServer/GameLogServer/log_reader.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/GameLogServer/GameLogServer/log_reader.py b/GameLogServer/GameLogServer/log_reader.py index c8ea79fc3..0026b8b57 100644 --- a/GameLogServer/GameLogServer/log_reader.py +++ b/GameLogServer/GameLogServer/log_reader.py @@ -8,7 +8,7 @@ class LogReader(object): def __init__(self): self.log_file_sizes = {} # (if the time between checks is greater, ignore ) - in seconds - self.max_file_time_change = 60 + self.max_file_time_change = 30 def read_file(self, path, retrieval_key): # this removes old entries that are no longer valid @@ -40,8 +40,8 @@ class LogReader(object): next_retrieval_key = self._generate_key() # this is the first time the key has been requested, so we need to the next one - if retrieval_key not in self.log_file_sizes: - print('retrieval key "%s" does not exist' % retrieval_key) + if retrieval_key not in self.log_file_sizes or int(time.time() - self.log_file_sizes[retrieval_key]['read']) > self.max_file_time_change: + print('retrieval key "%s" does not exist or is outdated' % retrieval_key) last_log_info = { 'size' : new_file_size, 'previous_key' : None From 001ecc5961a3a84aa9a59560d81975b2181dd0a0 Mon Sep 17 00:00:00 2001 From: RaidMax Date: Mon, 12 Aug 2019 20:00:40 -0500 Subject: [PATCH 2/2] prevent flagging banned players --- SharedLibraryCore/PartialEntities/EFClient.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SharedLibraryCore/PartialEntities/EFClient.cs b/SharedLibraryCore/PartialEntities/EFClient.cs index 12b419ace..70f3356c7 100644 --- a/SharedLibraryCore/PartialEntities/EFClient.cs +++ b/SharedLibraryCore/PartialEntities/EFClient.cs @@ -250,7 +250,7 @@ namespace SharedLibraryCore.Database.Models e.FailReason = GameEvent.EventFailReason.Permission; } - else if (Level == Permission.Flagged) + else if (Level == Permission.Flagged || Level == Permission.Banned) { e.FailReason = GameEvent.EventFailReason.Invalid; } @@ -282,7 +282,7 @@ namespace SharedLibraryCore.Database.Models e.FailReason = GameEvent.EventFailReason.Permission; } - else if (Level != Permission.Flagged) + else if (Level != Permission.Flagged || Level == Permission.Banned) { e.FailReason = GameEvent.EventFailReason.Invalid; }