From e2eed633e8c7358e5fc5a89b48a30f91c6530804 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Thu, 5 Oct 2017 07:13:04 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30532 --- .../deploy-mediacube-modules.launch | 2 +- server/-configuration/start-mediacube.sh | 2 +- server/-modules/pom.xml | 12 ++ server/-product/log4j2.xml | 9 +- server/-product/mediacube.product | 107 +++++++++--------- server/-product/pom.xml | 2 +- .../config/config.xml | 2 +- .../deploy-steps-to-bsh.bat | 2 +- .../jobtemplates/archive-material.xml | 2 +- .../steps/ArchiveMaterialSubmitStep.java | 4 +- .../server/steps/MetadataTransformStep.java | 4 + .../jobengine/server/steps/TSMBackupStep.java | 3 +- .../database/structure.sql | 2 + .../sql/2-CreateStructure.db2 | 6 +- .../src/user/jobengine/db/Media.java | 45 ++++---- .../META-INF/MANIFEST.MF | 1 + server/user.jobengine.osgi.server/pom.xml | 78 ++++++------- .../osgi/server/ConsoleCommandProvider.java | 63 ++++++----- .../src/user/jobengine/server/JobEngine.java | 6 +- 19 files changed, 193 insertions(+), 159 deletions(-) diff --git a/server/-configuration/deploy-mediacube-modules.launch b/server/-configuration/deploy-mediacube-modules.launch index 0ea55e61..10378f8e 100644 --- a/server/-configuration/deploy-mediacube-modules.launch +++ b/server/-configuration/deploy-mediacube-modules.launch @@ -3,7 +3,7 @@ - + diff --git a/server/-configuration/start-mediacube.sh b/server/-configuration/start-mediacube.sh index dbad0af3..d0fbed97 100644 --- a/server/-configuration/start-mediacube.sh +++ b/server/-configuration/start-mediacube.sh @@ -8,4 +8,4 @@ export LIBPATH=/opt/tivoli/tsm/client/ba/bin:/opt/tivoli/tsm/client/api/bin64 export SHLIB_PATH=/opt/tivoli/tsm/client/ba/bin:/opt/tivoli/tsm/client/api/bin64 export TZ=NFT-1DFT,M3.5.0,M10.5.0 export PATH=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-4.b14.el7.x86_64/bin:$PATH -./mediacube \ No newline at end of file +nohup ./mediacube & \ No newline at end of file diff --git a/server/-modules/pom.xml b/server/-modules/pom.xml index 4599ca36..14e209a0 100644 --- a/server/-modules/pom.xml +++ b/server/-modules/pom.xml @@ -20,6 +20,9 @@ 1.0.0 1.0.0 + 1.8 + 1.8 + UTF-8 UTF-8 scp://root:password@10.10.1.28 @@ -43,6 +46,15 @@ + + + + + + + + + org.eclipse.tycho tycho-packaging-plugin diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml index 05196b3a..a250b371 100644 --- a/server/-product/log4j2.xml +++ b/server/-product/log4j2.xml @@ -29,10 +29,15 @@ - + + + + + + @@ -59,7 +64,7 @@ - -- +- - diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index 0b6c7938..69f1774b 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -7,66 +7,67 @@ - -consoleLog -console + -consoleLog -console 5555 - -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888 --Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory - -#System --Dorg.eclipse.equinox.http.jetty.http.port=8080 --Dorg.eclipse.epp.logging.aeri.skipReports=true --Declipse.ignoreApp=true --Dosgi.noShutdown=true --Djetty.home=./configuration/jetty --Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,etc/user-jetty-http.xml,etc/user-jetty-https.xml --Dlog4j.configurationFile=./configuration/log4j2.xml --Djobengine.loglevel=INFO --Djobengine.jobsteps.root=./configuration/executors --Djobengine.jobtemplates.root=./configuration/jobtemplates + -Dfile.encoding=UTF-8 +-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888 +-Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory + +#System +-Dorg.eclipse.equinox.http.jetty.http.port=8080 +-Dorg.eclipse.epp.logging.aeri.skipReports=true +-Declipse.ignoreApp=true +-Dosgi.noShutdown=true +-Djetty.home=./configuration/jetty +-Djetty.etc.config.urls=etc/user-jetty.xml,etc/user-jetty-ssl.xml,etc/user-jetty-ssl-context.xml,etc/user-jetty-http.xml,etc/user-jetty-https.xml +-Dlog4j.configurationFile=./configuration/log4j2.xml +-Djobengine.loglevel=INFO +-Djobengine.jobsteps.root=./configuration/executors +-Djobengine.jobtemplates.root=./configuration/jobtemplates -Djobengine.jobscheduling.config=./configuration/scheduledjobs.json - #Database --Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; --Djobengine.db.user=db2admin --Djobengine.db.password=password --Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; --Djobengine.nosql.db.user=db2admin --Djobengine.nosql.db.password=password --Djobengine.nosql.db.schema=test - -#Octopus --Djobengine.octopus.api.address=http://10.10.1.11/api/v1 --Djobengine.octopus.api.user=mam --Djobengine.octopus.api.password=napocska - -#Selenio --Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl --Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium - -#Nexio + #Database +-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.db.user=db2admin +-Djobengine.db.password=password +-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.nosql.db.user=db2admin +-Djobengine.nosql.db.password=password +-Djobengine.nosql.db.schema=test + +#Octopus +-Djobengine.octopus.api.address=http://10.10.1.11/api/v1 +-Djobengine.octopus.api.user=mam +-Djobengine.octopus.api.password=napocska + +#Selenio +-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl +-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium + +#Nexio -Dnexio.host=10.10.1.55 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - #Database --Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true; --Djobengine.db.user=db2admin --Djobengine.db.password=password --Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true; --Djobengine.nosql.db.user=db2admin --Djobengine.nosql.db.password=password --Djobengine.nosql.db.schema=test - -#Octopus --Djobengine.octopus.api.address=http://10.10.1.11/api/v1 --Djobengine.octopus.api.user=mam --Djobengine.octopus.api.password=napocska - -#Selenio --Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl --Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium - -#Nexio + #Database +-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.db.user=db2admin +-Djobengine.db.password=password +-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true; +-Djobengine.nosql.db.user=db2admin +-Djobengine.nosql.db.password=password +-Djobengine.nosql.db.schema=test + +#Octopus +-Djobengine.octopus.api.address=http://10.10.1.11/api/v1 +-Djobengine.octopus.api.user=mam +-Djobengine.octopus.api.password=napocska + +#Selenio +-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl +-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium + +#Nexio -Dnexio.host=10.10.1.55 diff --git a/server/-product/pom.xml b/server/-product/pom.xml index 1bd08ab1..d648665d 100644 --- a/server/-product/pom.xml +++ b/server/-product/pom.xml @@ -277,7 +277,7 @@ "synchronize remote" "call chmod +x mediacube" "call chmod +x start-mediacube.sh" - "call nohup ./start-mediacube.sh &" + "call ./start-mediacube.sh" "exit" diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml index 4baca823..aaf3508a 100644 --- a/server/user.jobengine.executors/config/config.xml +++ b/server/user.jobengine.executors/config/config.xml @@ -5,7 +5,7 @@ - + diff --git a/server/user.jobengine.executors/deploy-steps-to-bsh.bat b/server/user.jobengine.executors/deploy-steps-to-bsh.bat index ecdafacc..2acba7d3 100644 --- a/server/user.jobengine.executors/deploy-steps-to-bsh.bat +++ b/server/user.jobengine.executors/deploy-steps-to-bsh.bat @@ -1,6 +1,6 @@ @ECHO OFF -SET REMOTE_HOST=10.10.1.26 +SET REMOTE_HOST=10.10.1.28 SET REMOTE_LOCATION=/opt/mediacube/configuration/executors SET REMOTE_SERVER_HOSTKEY=ssh-rsa 2048 7e:0a:bb:8b:38:0f:22:c3:81:d4:1a:44:f3:91:ea:1f SET REMOTE_SERVER_ADDRESS=scp://root:password@%REMOTE_HOST% diff --git a/server/user.jobengine.executors/jobtemplates/archive-material.xml b/server/user.jobengine.executors/jobtemplates/archive-material.xml index 784b0f50..500f3264 100644 --- a/server/user.jobengine.executors/jobtemplates/archive-material.xml +++ b/server/user.jobengine.executors/jobtemplates/archive-material.xml @@ -1,5 +1,5 @@ - + diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java index d8efb0b7..bea945bf 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/ArchiveMaterialSubmitStep.java @@ -15,6 +15,7 @@ import user.jobengine.server.IJobRuntime; * @author robi */ public class ArchiveMaterialSubmitStep extends JobStep { + private static final String ARCHIVE = "Archiválás"; private static final String GLOBAL_INPUT_FOLDER = "globalInputFolder"; private static final Logger logger = LogManager.getLogger(); private static final String JOBTEMPLATE = "archive-material.xml"; @@ -24,9 +25,8 @@ public class ArchiveMaterialSubmitStep extends JobStep { public Object[] execute(String globalInputFolder, ArrayList archiveList, IJobEngine jobEngine, IJobRuntime jobRuntime) { try { for (ArchiveItem archiveItem : archiveList) { - String title = "Archiválás: " + archiveItem.getMediaFile().toFile().getName(); try { - IJobRuntime submit = jobEngine.submit(JOBTEMPLATE, title, + IJobRuntime submit = jobEngine.submit(JOBTEMPLATE, ARCHIVE, ListUtils.asMap(ARCHIVE_ITEM, archiveItem, GLOBAL_INPUT_FOLDER, globalInputFolder)); } catch (Exception e) { if (archiveItem != null) diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java index 77c30ea1..61a6b293 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/MetadataTransformStep.java @@ -38,7 +38,11 @@ public class MetadataTransformStep extends JobStep { itemManager.mergeItemStructure(mediaCubeItem); } catch (Exception e) { logger.catching(e); + if (!archiveItem.removeCatchedFile()) + logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", archiveItem.getMediaFile().toFile().getName()); + throw e; + } finally { jobRuntime.incrementProgress(100); } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java index 3f4ee2e8..393d6e11 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/TSMBackupStep.java @@ -56,11 +56,12 @@ public class TSMBackupStep extends JobStep { RemoteFile remoteFile = sourceUri.transferFrom(targetStoreUri, sourceFileName, sourceFileName); saveMetadata(mediaCubeMedia, sourceFileName); + logger.info(getMarker(), "A {} állomány archiválása sikeres.", archiveItem.getMediaFile().toFile().getName()); } catch (Exception e) { logger.catching(e); if (!archiveItem.removeCatchedFile()) - logger.error("Can not delete .catched file for {}", inputFilePath.toString()); + logger.error(getMarker(), "A {} állomány .catched jelző állománya nem törölhető.", archiveItem.getMediaFile().toFile().getName()); throw e; } return null; diff --git a/server/user.jobengine.osgi.db/database/structure.sql b/server/user.jobengine.osgi.db/database/structure.sql index 2d5fb7b6..e29e6603 100644 --- a/server/user.jobengine.osgi.db/database/structure.sql +++ b/server/user.jobengine.osgi.db/database/structure.sql @@ -1,3 +1,5 @@ +ALTER TABLE MEDIA ALTER COLUMN DESCRIPTION DROP NOT NULL +ALTER TABLE ITEM ALTER COLUMN DESCRIPTION DROP NOT NULL ALTER TABLE MEDIAFILE ADD COLUMN HOUSEID VARCHAR(40) CREATE INDEX IDX_MEDIAFILE_HOUSEID ON MEDIAFILE ("HOUSEID") diff --git a/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 b/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 index 16edacbe..80efa586 100644 --- a/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 +++ b/server/user.jobengine.osgi.db/sql/2-CreateStructure.db2 @@ -1,4 +1,4 @@ ---execute with +-execute with -- db2 -td@ -vmf 2-CreateStructure.db2 CONNECT TO MC USER db2admin USING salabakter@ @@ -153,7 +153,7 @@ CREATE TABLE ITEM ITEMTYPEID BIGINT NOT NULL, HOUSEID VARCHAR(40), TITLE VARCHAR(80) NOT NULL, - DESCRIPTION VARCHAR(255) NOT NULL, + DESCRIPTION VARCHAR(255), ISFOLDER CHARACTER(1) NOT NULL DEFAULT 'N', CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP, @@ -198,7 +198,7 @@ CREATE TABLE MEDIA ITEMTYPEID BIGINT NOT NULL, HOUSEID VARCHAR(40), TITLE VARCHAR(40) NOT NULL, - DESCRIPTION VARCHAR(255) NOT NULL, + DESCRIPTION VARCHAR(255), LENGTH BIGINT NOT NULL, CREATED TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL, MODIFIED TIMESTAMP NOT NULL GENERATED BY DEFAULT FOR EACH ROW ON UPDATE AS ROW CHANGE TIMESTAMP, diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java index 1d8ecd86..acfa8b3a 100644 --- a/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java +++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/Media.java @@ -9,10 +9,10 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import user.commons.TimestampAdapter; /** - * Verzió Pojo osztály. - * + * Verzi� Pojo oszt�ly. + * * @author User - * + * */ public class Media extends DynamicAttributes { private static final long serialVersionUID = 1L; @@ -52,6 +52,10 @@ public class Media extends DynamicAttributes { return this.houseId; } + public boolean getIsPartialEnabled() { + return isPartialEnabled; + } + public long getItemId() { return this.itemId; } @@ -63,11 +67,14 @@ public class Media extends DynamicAttributes { @SuppressWarnings("unchecked") public List getMediaFiles() { if (mediaFiles == null) - mediaFiles = (List) (List) ItemManager.getInstance() - .getAll(MediaFile.class, getId()); + mediaFiles = (List) (List) ItemManager.getInstance().getAll(MediaFile.class, getId()); return mediaFiles; } + public byte[] getPoster() { + return poster; + } + public String getTitle() { return title; } @@ -81,7 +88,7 @@ public class Media extends DynamicAttributes { } public void setDescription(String description) { - checkParameter("Description", description); + //checkParameter("Description", description); this.description = description; } @@ -89,6 +96,10 @@ public class Media extends DynamicAttributes { houseId = id; } + public void setIsPartialEnabled(boolean isPartialEnabled) { + this.isPartialEnabled = isPartialEnabled; + } + public void setItemId(long itemId) { // checkParameter("ItemId", itemId); this.itemId = itemId; @@ -98,28 +109,16 @@ public class Media extends DynamicAttributes { this.length = length; } - public void setTitle(String title) { - checkParameter("Title", title); - this.title = title; - } - public void setMediaFiles(List mediaFiles) { this.mediaFiles = mediaFiles; } - public boolean getIsPartialEnabled() { - return isPartialEnabled; - } - - public void setIsPartialEnabled(boolean isPartialEnabled) { - this.isPartialEnabled = isPartialEnabled; - } - - public byte[] getPoster() { - return poster; - } - public void setPoster(byte[] poster) { this.poster = poster; } + + public void setTitle(String title) { + checkParameter("Title", title); + this.title = title; + } } \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF index bb3fd83c..abcec96b 100644 --- a/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF +++ b/server/user.jobengine.osgi.server/META-INF/MANIFEST.MF @@ -84,4 +84,5 @@ Bundle-ClassPath: ., Bundle-ActivationPolicy: lazy Web-ContextPath: / Bundle-Activator: user.jobengine.osgi.server.Activator +Bundle-RequiredExecutionEnvironment: JavaSE-1.8 diff --git a/server/user.jobengine.osgi.server/pom.xml b/server/user.jobengine.osgi.server/pom.xml index 9dba4032..77c5d836 100644 --- a/server/user.jobengine.osgi.server/pom.xml +++ b/server/user.jobengine.osgi.server/pom.xml @@ -1,7 +1,6 @@ - + ../-modules user.jobengine @@ -12,40 +11,41 @@ user.jobengine.osgi.server eclipse-plugin 1.0.0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java b/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java index 8a7e92ee..36b6e265 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/osgi/server/ConsoleCommandProvider.java @@ -2,42 +2,49 @@ package user.jobengine.osgi.server; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.core.runtime.adaptor.EclipseStarter; import org.eclipse.osgi.framework.console.CommandInterpreter; import org.eclipse.osgi.framework.console.CommandProvider; +import org.osgi.framework.BundleContext; +import org.osgi.framework.FrameworkUtil; +import org.osgi.framework.ServiceReference; +import user.jobengine.server.IJobEngine; + +// Bundle[] bundles = bundleContext.getBundles(); +// for (Bundle b : bundles) { +// if ((b.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) +// continue; +// if ("org.eclipse.equinox.ds".equals(b.getSymbolicName())) +// continue; +// if ("user.jobengine.osgi.commons".equals(b.getSymbolicName())) +// continue; +// +// logger.info("Stopping {} ", b.getSymbolicName()); +// b.stop(); +// } public class ConsoleCommandProvider implements CommandProvider { private static final Logger logger = LogManager.getLogger(); @SuppressWarnings("restriction") public Object _halt(CommandInterpreter intp) { - StringBuffer buffer = new StringBuffer(); - // Thread shutdownThread = new Thread(() -> { - // try { - // Thread.sleep(1000); - // BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); - // if (bundleContext != null) { - // Bundle[] bundles = bundleContext.getBundles(); - // for (Bundle b : bundles) { - // if ((b.adapt(BundleRevision.class).getTypes() & BundleRevision.TYPE_FRAGMENT) != 0) - // continue; - // if ("org.eclipse.equinox.ds".equals(b.getSymbolicName())) - // continue; - // if ("user.jobengine.osgi.commons".equals(b.getSymbolicName())) - // continue; - // - // logger.info("Stopping {} ", b.getSymbolicName()); - // b.stop(); - // } - // } - // EclipseStarter.shutdown(); - // - // System.exit(0); - // } catch (Exception e) { - // logger.error("Error:", e); - // } - // }); - // shutdownThread.start(); - // buffer.append("Shutdown initiated"); + final StringBuffer buffer = new StringBuffer(); + Thread shutdownThread = new Thread(() -> { + try { + buffer.append("HALT"); + Thread.sleep(1000); + BundleContext context = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); + ServiceReference reference = context.getServiceReference(IJobEngine.class); + IJobEngine jobEngine = context.getService(reference); + jobEngine.shutdown(); + EclipseStarter.shutdown(); + + System.exit(0); + } catch (Exception e) { + logger.error("Error:", e); + } + }); + shutdownThread.start(); buffer.append("...and catch fire!"); return buffer.toString(); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java index 033e7a4e..283a227e 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobEngine.java @@ -665,7 +665,7 @@ public class JobEngine implements IJobEngine { /** * Job prioritasa megvaltozott. Job main queue-ban es a JobStepExecutorok soraiban is ujra kell rendezni a jobokat. Az ujrarendezes a put-nal is megy * automatikusan, mivel eltero prioritasu jobot dobhatnak be vagy default prioritasut a korabban atrendezett listaba. - * + * * @param jobRuntime */ @Override @@ -719,8 +719,10 @@ public class JobEngine implements IJobEngine { private void shutdownExecutors() { if (executors != null) - for (IJobStepExecutor executor : executors.values()) + for (IJobStepExecutor executor : executors.values()) { + logger.info("Stopping executor {}", executor.getStepClass()); executor.shutdown(); + } } @Override -- 2.54.0