From d7ab76f5fc5a3a88f95cd87d616d2d3e7b9b569b Mon Sep 17 00:00:00 2001
From: Ivan Maslov <i.maslov@mail.ru>
Date: Wed, 1 May 2019 00:39:19 +0300
Subject: [PATCH] #RestartOrchestrator

---
 Orchestrator/Web/Index.xhtml          | 19 +++++++++++++++++++
 Orchestrator/orchestratorProcessor.py | 12 ++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Orchestrator/Web/Index.xhtml b/Orchestrator/Web/Index.xhtml
index 1c7d7d55..8528ac95 100644
--- a/Orchestrator/Web/Index.xhtml
+++ b/Orchestrator/Web/Index.xhtml
@@ -104,6 +104,20 @@
 						dataType: "text"
 					});
 				}
+				///Перезагрузить Orchestrator
+				mGlobal.Controller.OrchestratorRestart=function() {
+					$.ajax({
+					  type: "POST",
+					  url: 'ProcessingRun',
+					  data: '{"actionList":[{"type":"ActivityRestartOrchestrator"}]}',
+					  success: 
+						function(lData,l2,l3)
+						{
+							var lResponseJSON=JSON.parse(lData)
+						},
+					  dataType: "text"
+					});
+				}
 				
 				//////////////////////////
 				/////Monitor JS module
@@ -277,6 +291,11 @@
 				<i class="desktop icon"></i>
 				Look machine screenshot
 			</button>
+			<button class="ui labeled icon button red" onclick="mGlobal.Controller.OrchestratorRestart();">
+				<i class="down icon"></i>
+				Restart Orchestrator
+			</button>
+			
 			<script class="openrpa-hidden-monitor-table-general" style="display:none" type="text/x-handlebars-template">
 				<table class="ui celled table">
 					<thead>
diff --git a/Orchestrator/orchestratorProcessor.py b/Orchestrator/orchestratorProcessor.py
index a7d21796..3c005e3f 100644
--- a/Orchestrator/orchestratorProcessor.py
+++ b/Orchestrator/orchestratorProcessor.py
@@ -3,6 +3,7 @@ import http.client
 import json
 import pdb
 import os
+import sys
 import subprocess
 #Глобальная переменная - все глобальные значения программы
 global mGlobalDict
@@ -21,6 +22,9 @@ global mGlobalDict
 #           {
 #               type: <ActivityCMDRun>,
 #				code: <str>
+#           },
+#           {
+#               type: <ActivityRestartOrchestrator>
 #           }
 #       ]
 #
@@ -57,5 +61,9 @@ def ProcessingRun(inConfigurationDict):
             subprocess.Popen(lCMDCode)
             lResultCMDRun=1#os.system(lCMDCode)
             lResult["actionListResult"][-1] = {**lResult["actionListResult"][-1], **{"result":str(lResultCMDRun)}}
-	#Вернуть результат
-    return lResult
+        #Обработка команды ActivityRestartOrchestrator
+        if lItem["type"]=="ActivityRestartOrchestrator":
+            os.execl(sys.executable,os.path.abspath(__file__),*sys.argv)
+            sys.exit(0)
+    #Вернуть результат
+    return lResult
\ No newline at end of file