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):