From 05b99203b130a23a02d7ae3eae38303ed769d595 Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Wed, 13 Nov 2019 16:57:44 +0100 Subject: [PATCH] Changes for small performance things --- hugvey/central_command.py | 24 ++++++++++++++++++++++-- hugvey/story.py | 2 +- hugvey_server.py | 4 ++-- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/hugvey/central_command.py b/hugvey/central_command.py index a3c75e8..b85c868 100644 --- a/hugvey/central_command.py +++ b/hugvey/central_command.py @@ -74,6 +74,8 @@ class CentralCommand(object): self.args = args # cli args self.timer = Stopwatch() + + self.hugveyWarnings = {} eventLogger.addHandler(logging.handlers.QueueHandler(self.logQueue)) @@ -159,6 +161,8 @@ class CentralCommand(object): status['duration'] = 0 if not hv.story else hv.story.timer.getElapsed() status['has_state'] = Story.hugveyHasSavedState(hv.lightId) status['variables'] = {} if not isSelected or not hv.story else hv.story.variableValues + +# evLogger = eventLogger.getChild(f"{hv_id}") if not hv.story: status['time_since_hugvey_spoke'] = '-' @@ -169,12 +173,28 @@ class CentralCommand(object): elif not hasattr(hv.story, 'lastMsgFinishTime') or not hv.story.lastMsgFinishTime: status['time_since_hugvey_spoke'] = 'speaking' else: - status['time_since_hugvey_spoke'] = str(datetime.timedelta(seconds=int(hv.story.timer.getElapsed() - hv.story.lastMsgFinishTime))) + diff = datetime.timedelta(seconds=int(hv.story.timer.getElapsed() - hv.story.lastMsgFinishTime)) + status['time_since_hugvey_spoke'] = str(diff) +# if diff > 300: +# evLogger.warning("Very long time since hugvey spoke") +# elif diff > 100: +# evLogger.warning("Long time since hugvey spoke") +# else: +# #clear warning +# pass if not hv.story.timer.hasMark('last_speech'): status['time_since_visitor_spoke'] = 'never' else: - status['time_since_visitor_spoke'] = str(datetime.timedelta(seconds=int(hv.story.timer.getElapsed('last_speech')))) + diff = datetime.timedelta(seconds=int(hv.story.timer.getElapsed('last_speech'))) + status['time_since_visitor_spoke'] = str(diff) +# if diff > 300: +# evLogger.warning("Very long time since audience spoke") +# elif diff > 100: +# evLogger.warning("Long time since audience spoke") +# else: +# #clear warning +# pass return status diff --git a/hugvey/story.py b/hugvey/story.py index efb7589..1d1e26a 100644 --- a/hugvey/story.py +++ b/hugvey/story.py @@ -2016,7 +2016,7 @@ class Story(object): @classmethod def getStateDir(self): # return "/tmp" - return "./recordings" + return "./state" # day = time.strftime("%Y%m%d") # t = time.strftime("%H:%M:%S") # diff --git a/hugvey_server.py b/hugvey_server.py index ac6a127..1b78268 100644 --- a/hugvey_server.py +++ b/hugvey_server.py @@ -42,8 +42,8 @@ if __name__ == '__main__': logger = logging.getLogger("hugvey") logFileHandler = logging.handlers.RotatingFileHandler( - './recordings/server.log', - maxBytes=1024*512, + './state/server.log', + maxBytes=1024*5120, backupCount=5 ) logFileHandler.setFormatter(logging.Formatter(