From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Thu, 22 Oct 2020 12:33:26 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=5410b90b26faf1e0bf881d02cab94d083c8439cf;p=mediacube.git

git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32001
---

diff --git a/server/-configuration/log4j2-test.xml b/server/-configuration/log4j2-test.xml
index a076d04d..367b2a61 100644
--- a/server/-configuration/log4j2-test.xml
+++ b/server/-configuration/log4j2-test.xml
@@ -25,7 +25,7 @@
 		<Root level="INFO">
 			<AppenderRef ref="Console" />
 			<AppenderRef ref="MarkeredConsole" />
-			<AppenderRef ref="MarkeredMail" />
+<!-- 			<AppenderRef ref="MarkeredMail" /> -->
 		</Root>
 	</Loggers>
 </Configuration>
\ No newline at end of file
diff --git a/server/-configuration/log4j2.xml b/server/-configuration/log4j2.xml
index f988a5e1..7153ef31 100644
--- a/server/-configuration/log4j2.xml
+++ b/server/-configuration/log4j2.xml
@@ -54,7 +54,7 @@
 			<AppenderRef ref="Console" />
 			<AppenderRef ref="MarkeredConsole" />
 <!-- 			<AppenderRef ref="RollingFile" /> -->
-			<AppenderRef ref="MarkeredMail" />
+<!-- 			<AppenderRef ref="MarkeredMail" /> -->
 <!-- 			<AppenderRef ref="MarkeredDB2" /> -->
 		</Root>
 		<Logger name="org.zkoss" level="trace" additivity="false" />
diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml
index 49d708c0..2b3595c0 100644
--- a/server/user.jobengine.executors/config/config.xml
+++ b/server/user.jobengine.executors/config/config.xml
@@ -7,6 +7,7 @@
 	<executor className="MergeStep.java" maxConcurrent="20" isRemote="false" />
 	<executor className="TestForkCancelableStep.java" maxConcurrent="10" isRemote="false" />
 	<executor className="RegisterUserRestoreStep.java" maxConcurrent="3" isRemote="false" />
+	<executor className="user.jobengine.server.steps.RegisterVODRestoreStep" maxConcurrent="3" isRemote="false" />
 	<executor className="user.jobengine.server.steps.ArchiveListBuilderStep" maxConcurrent="1" isRemote="false" />
 	<executor className="user.jobengine.server.steps.ArchiveMaterialSubmitStep" maxConcurrent="1" isRemote="false" />
 	<executor className="user.jobengine.server.steps.BatchRetrieveForkStep" maxConcurrent="10" isRemote="false" />