From 3245a7f17df63d498b8ee3fed260ac8f8d557049 Mon Sep 17 00:00:00 2001 From: Ivan Maslov Date: Tue, 23 Apr 2019 22:28:28 +0300 Subject: [PATCH] =?UTF-8?q?#=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D1=80=D0=B0=D0=BC=D0=B5=D1=82=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=20(=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=20?= =?UTF-8?q?=D0=BE=D1=80=D0=BA=D0=B5=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=BE?= =?UTF-8?q?=D1=80=20=D0=B8=D0=BD=D1=84=D0=BE=D1=80=D0=BC=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8E=20=D0=BF=D0=BE=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5?= =?UTF-8?q?=D0=B9=20=D0=BC=D0=B0=D1=88=D0=B8=D0=BD=D0=B5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Orchestrator/Web/Index.xhtml | 2 +- Orchestrator/orchestratorMain.py | 4 ++-- Orchestrator/orchestratorServer.py | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Orchestrator/Web/Index.xhtml b/Orchestrator/Web/Index.xhtml index 5ae24723..ab8ee2c6 100644 --- a/Orchestrator/Web/Index.xhtml +++ b/Orchestrator/Web/Index.xhtml @@ -65,7 +65,7 @@ return inPrefix+Math.round(Math.random()*1000)+"-"+Math.round(Math.random()*10000)+"-"+Math.round(Math.random()*1000) } //inHostURI: http://localhost:8081 - mGlobal.Monitor.ScreenshotModal.Show=function(inHostURI) { + mGlobal.Monitor.ScreenshotModal.Show=function(inHostURI=" ") { $('.ui.modal.daemon-screenshot').modal('show'); //Функция обновления картинки diff --git a/Orchestrator/orchestratorMain.py b/Orchestrator/orchestratorMain.py index 73c872a4..fe89ba7b 100644 --- a/Orchestrator/orchestratorMain.py +++ b/Orchestrator/orchestratorMain.py @@ -8,8 +8,6 @@ import signal import pdb import orchestratorServer - - #Чтение конфигурации lDaemonConfigurationFile = codecs.open("orchestratorConfiguration.json", "r","utf_8_sig") lDaemonConfigurationJSONString = lDaemonConfigurationFile.read() @@ -23,6 +21,8 @@ lDaemonLoopSeconds=lDaemonConfigurationObject["loopSeconds"] lDaemonActivityLogDict={} #Словарь отработанных активностей, ключ - кортеж (, , , ) lDaemonStartDateTime=datetime.datetime.now() +orchestratorServer.mActivityLogDict = lDaemonActivityLogDict + #Инициализация сервера lThreadServer = orchestratorServer.RobotDaemonServer("ServerThread",lDaemonConfigurationObject) lThreadServer.start() diff --git a/Orchestrator/orchestratorServer.py b/Orchestrator/orchestratorServer.py index 8a11f36b..64e20cd1 100644 --- a/Orchestrator/orchestratorServer.py +++ b/Orchestrator/orchestratorServer.py @@ -14,6 +14,10 @@ def SaveScreenshot(inFilePath): lScreenshot = ImageGrab.grab() # save image file lScreenshot.save('screenshot.png') + +#Глобальные переменные +global mActivityLogDict + mJSONConfigurationDict={} class RobotDaemonServer(Thread): def __init__(self,name,inJSONConfigurationDict):