From b92f63735fa2272ed3dcbf701424ed5be7479907 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 8 Jan 2018 08:22:06 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30822 --- .../install-mediacube-modules.launch | 19 ++++++++++ server/user.commons.log4j2/.classpath | 2 +- server/user.jobengine.executors/.classpath | 2 +- .../config/config.xml | 3 +- .../config/scheduledjobs.json | 26 ++++---------- .../server/steps/FakeNoParamsStep.java | 26 +++++++++----- .../user/jobengine/server/steps/FakeStep.java | 2 +- server/user.jobengine.osgi.commons/.classpath | 2 +- server/user.jobengine.osgi.db/.classpath | 2 +- .../user.jobengine.osgi.server/deploy.launch | 2 +- .../pages/joblist.zul | 4 +-- .../user.jobengine.osgi.server/pages/menu.zul | 4 +-- .../user/jobengine/zk/model/JobListModel.java | 13 ++++++- .../jobengine/zk/model/JobSelectorModel.java | 35 ++++++++++++------- .../user.jobengine.osgi.services/.classpath | 2 +- server/user.tsm.client/.classpath | 2 +- 16 files changed, 90 insertions(+), 56 deletions(-) create mode 100644 server/-configuration/install-mediacube-modules.launch diff --git a/server/-configuration/install-mediacube-modules.launch b/server/-configuration/install-mediacube-modules.launch new file mode 100644 index 00000000..9224ace2 --- /dev/null +++ b/server/-configuration/install-mediacube-modules.launch @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/server/user.commons.log4j2/.classpath b/server/user.commons.log4j2/.classpath index b862a296..6e16b23d 100644 --- a/server/user.commons.log4j2/.classpath +++ b/server/user.commons.log4j2/.classpath @@ -1,7 +1,7 @@ - + diff --git a/server/user.jobengine.executors/.classpath b/server/user.jobengine.executors/.classpath index 1f733c48..48482498 100644 --- a/server/user.jobengine.executors/.classpath +++ b/server/user.jobengine.executors/.classpath @@ -2,6 +2,6 @@ - + diff --git a/server/user.jobengine.executors/config/config.xml b/server/user.jobengine.executors/config/config.xml index cd6c2e21..e482e38c 100644 --- a/server/user.jobengine.executors/config/config.xml +++ b/server/user.jobengine.executors/config/config.xml @@ -1,6 +1,7 @@ - + + diff --git a/server/user.jobengine.executors/config/scheduledjobs.json b/server/user.jobengine.executors/config/scheduledjobs.json index 87fb7660..a3a950de 100644 --- a/server/user.jobengine.executors/config/scheduledjobs.json +++ b/server/user.jobengine.executors/config/scheduledjobs.json @@ -24,7 +24,7 @@ ] }, { - "active": true, + "active": false, "executeimmediate": false, "name" : "Lejárt ISISLON/ARCHIVE anyagok törlése", "template": "delete-materials.xml", @@ -34,16 +34,16 @@ ] }, { - "active": false, - "executeimmediate": true, + "active": true, + "executeimmediate": false, "name" : "NEXIO anyagok másolása az ISILON/ARCHIVE mappába", "template": "copyforarchive-nexio-materials.xml", - "cronexpression": "0 0 0/1 1/1 * ? *", + "cronexpression": "0 0 10 * * ?", "parameters": [ {"name": "nexioPort", "value": 2098, "type": "java.lang.Integer"}, {"name": "nexioUserName", "value": "administrator", "type": "java.lang.String"}, {"name": "nexioPassword", "value": "system", "type": "java.lang.String"}, - {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE/TEST", "type": "java.lang.String"}, + {"name": "archiveFtp", "value": "ftp://10.10.1.100/ARCHIVE", "type": "java.lang.String"}, {"name": "archiveUserName", "value": "mediacube", "type": "java.lang.String"}, {"name": "archivePassword", "value": "Broadca5T", "type": "java.lang.String"}, {"name": "daysBeforeNow", "value": 1, "type": "java.lang.Integer"}, @@ -53,20 +53,6 @@ }, { "active": false, - "executeimmediate": true, - "name" : "Archiválás az ISILON/ARCHIVE/ONE mappából", - "template": "archive-ondemand.xml", - "cronexpression": "0 0 0/1 1/1 * ? *", - "parameters": [ - {"name": "sourcePath", "value": "/mnt/ISILON/ARCHIVE/ONE", "type": "java.lang.String"}, - {"name": "globalSourcePath", "value": "\\\\10.10.1.100\\BRAAVOS\\ARCHIVE\\ONE", "type": "java.lang.String"}, - {"name": "transcoderTargetPath", "value": "/mnt/SELENIO", "type": "java.lang.String"}, - {"name": "webPath", "value": "/mediacube/data/lowres/www/video", "type": "java.lang.String"}, - {"name": "killDateDays", "value": 1, "type": "java.lang.Integer"} - ] - }, - { - "active": false, "executeimmediate": true, "name" : "TRAFFIC anyagok visszatöltése", "template": "retrieve-traffic-missing-materials.xml", @@ -104,7 +90,7 @@ }, { "active": false, - "executeimmediate": true, + "executeimmediate": false, "name" : "NEXIO anyagok törlése", "template": "delete-nexio-materials.xml", "cronexpression": "0 0 0/1 1/1 * ? *", diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java index 915a19aa..ae1878d4 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeNoParamsStep.java @@ -11,15 +11,23 @@ public class FakeNoParamsStep extends JobStep { int count = 10; @StepEntry - public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) { - try { - logger.warn("| + | FakeNoParams step"); - jobRuntime.incrementProgress(50); - Thread.sleep(15000); - jobRuntime.incrementProgress(100); - logger.warn("| - | FakeNoParams step"); - } catch (Exception e) { - logger.error(e.getMessage()); + public Object[] execute(IJobEngine jobEngine, IJobRuntime jobRuntime) throws InterruptedException { + // try { + // logger.warn("| + | FakeNoParams step"); + // jobRuntime.incrementProgress(50); + // Thread.sleep(15000); + // jobRuntime.incrementProgress(100); + // logger.warn("| - | FakeNoParams step"); + // } catch (Exception e) { + // logger.error(e.getMessage()); + // } + for (int i = 0; i < count; i++) { + if (!canContinue()) + break; + jobRuntime.incrementProgress((i + 1) * count); + Thread.sleep(5000); + //logger.info(getMarker(), "Log markered"); + //logger.info("Progress {}", jobRuntime.getProgress()); } return null; } diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java index fd7c139f..d9a4177c 100644 --- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java +++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java @@ -19,7 +19,7 @@ public class FakeStep extends JobStep { if (!canContinue()) break; jobRuntime.incrementProgress((i + 1) * count); - Thread.sleep(1000); + Thread.sleep(500); //logger.info(getMarker(), "Log markered"); //logger.info("Progress {}", jobRuntime.getProgress()); } diff --git a/server/user.jobengine.osgi.commons/.classpath b/server/user.jobengine.osgi.commons/.classpath index 069739a5..5774abd3 100644 --- a/server/user.jobengine.osgi.commons/.classpath +++ b/server/user.jobengine.osgi.commons/.classpath @@ -1,8 +1,8 @@ - + diff --git a/server/user.jobengine.osgi.db/.classpath b/server/user.jobengine.osgi.db/.classpath index ad20a72a..ff5393b6 100644 --- a/server/user.jobengine.osgi.db/.classpath +++ b/server/user.jobengine.osgi.db/.classpath @@ -4,6 +4,6 @@ - + diff --git a/server/user.jobengine.osgi.server/deploy.launch b/server/user.jobengine.osgi.server/deploy.launch index 21dbc544..e1c38a1c 100644 --- a/server/user.jobengine.osgi.server/deploy.launch +++ b/server/user.jobengine.osgi.server/deploy.launch @@ -1,7 +1,7 @@ - + diff --git a/server/user.jobengine.osgi.server/pages/joblist.zul b/server/user.jobengine.osgi.server/pages/joblist.zul index a9ff3cb5..6d4c1725 100644 --- a/server/user.jobengine.osgi.server/pages/joblist.zul +++ b/server/user.jobengine.osgi.server/pages/joblist.zul @@ -18,7 +18,7 @@
- + @@ -35,7 +35,7 @@
- diff --git a/server/user.jobengine.osgi.server/pages/menu.zul b/server/user.jobengine.osgi.server/pages/menu.zul index f97e93bc..0cb794fb 100644 --- a/server/user.jobengine.osgi.server/pages/menu.zul +++ b/server/user.jobengine.osgi.server/pages/menu.zul @@ -60,8 +60,8 @@ - - + + diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java index 010051c9..f298174d 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobListModel.java @@ -170,6 +170,18 @@ public class JobListModel extends BaseModel implements IJobChangedListener { } } + @Command + @NotifyChange({ "shutdownDisabled", "startupDisabled" }) + public void restart() { + startupDisabled = true; + try { + jobEngine.startup(); + } catch (Exception e) { + } + shutdownDisabled = false; + initializeList(); + } + @Command @NotifyChange({ "updatePriorityDisabled" }) public void selectJob() { @@ -226,5 +238,4 @@ public class JobListModel extends BaseModel implements IJobChangedListener { shutdownDisabled = false; initializeList(); } - } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java index 17d8c81e..47f00bf8 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/JobSelectorModel.java @@ -41,21 +41,30 @@ public class JobSelectorModel extends BaseModel { public void execute() { if (selectedJobElement == null) return; - SchedulerService scheduler = jobEngine.getScheduler(); - ScheduledJob scheduledJob = scheduler.createScheduledJob(selectedJobElement.getDbObject()); - scheduledJob.setJobEngine(jobEngine); - for (int i = 0; i < 1; i++) { - - try { - if (!scheduledJob.isActive()) - scheduler.register(scheduledJob); - scheduler.executeImmediate(scheduledJob.getJobId()); - Thread.sleep(100); - } catch (Exception e) { - Messagebox.show(e.getMessage()); + + Runnable r = new Runnable() { + + @Override + public void run() { + SchedulerService scheduler = jobEngine.getScheduler(); + ScheduledJob scheduledJob = scheduler.createScheduledJob(selectedJobElement.getDbObject()); + scheduledJob.setJobEngine(jobEngine); + for (int i = 0; i < 1; i++) { + + try { + if (!scheduledJob.isActive()) + scheduler.register(scheduledJob); + scheduler.executeImmediate(scheduledJob.getJobId()); + Thread.sleep(300); + } catch (Exception e) { + Messagebox.show(e.getMessage()); + } + } + } - } + }; + new Thread(r).start(); close(); } diff --git a/server/user.jobengine.osgi.services/.classpath b/server/user.jobengine.osgi.services/.classpath index b862a296..6e16b23d 100644 --- a/server/user.jobengine.osgi.services/.classpath +++ b/server/user.jobengine.osgi.services/.classpath @@ -1,7 +1,7 @@ - + diff --git a/server/user.tsm.client/.classpath b/server/user.tsm.client/.classpath index b1dabee3..6e16b23d 100644 --- a/server/user.tsm.client/.classpath +++ b/server/user.tsm.client/.classpath @@ -1,7 +1,7 @@ - + -- 2.54.0