From: Vásáry Dániel Date: Tue, 21 Nov 2017 08:37:34 +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=ceff054bfdb8a3a7392e5b717ea63af9cc22debf;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30751 --- diff --git a/client/Maestro/Configuration/configuration-nle.json b/client/Maestro/Configuration/configuration-nle.json index aa4440e8..e6d8a88e 100644 --- a/client/Maestro/Configuration/configuration-nle.json +++ b/client/Maestro/Configuration/configuration-nle.json @@ -1,6 +1,6 @@ { "title": "NLE", - "active": true, + "active": false, "startInTray": false, "enableCustomMetadataId": true, "player": { diff --git a/client/Maestro/Installer/installforge-installer-project.ifp b/client/Maestro/Installer/installforge-installer-project.ifp index d44b6c2a..f289b99e 100644 Binary files a/client/Maestro/Installer/installforge-installer-project.ifp and b/client/Maestro/Installer/installforge-installer-project.ifp differ diff --git a/client/Maestro/Properties/AssemblyInfo.cs b/client/Maestro/Properties/AssemblyInfo.cs index 8d42e911..e4b28889 100644 --- a/client/Maestro/Properties/AssemblyInfo.cs +++ b/client/Maestro/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.0.3.1")] -[assembly: AssemblyFileVersion("2.0.3.1")] +[assembly: AssemblyVersion("2.0.4.0")] +[assembly: AssemblyFileVersion("2.0.4.0")] diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml index ef66dee9..f81b90af 100644 --- a/server/-product/log4j2.xml +++ b/server/-product/log4j2.xml @@ -30,7 +30,7 @@ - + diff --git a/server/user.commons.log4j2/src/user/commons/log4j2/appender/HTMLMailAppender.java b/server/user.commons.log4j2/src/user/commons/log4j2/appender/HTMLMailAppender.java index 7df714d4..470bf16b 100644 --- a/server/user.commons.log4j2/src/user/commons/log4j2/appender/HTMLMailAppender.java +++ b/server/user.commons.log4j2/src/user/commons/log4j2/appender/HTMLMailAppender.java @@ -119,7 +119,7 @@ public final class HTMLMailAppender extends AbstractAppender { /** The SMTP Manager */ private final SmtpManager manager; - private final ExecutorService executor = Executors.newFixedThreadPool(1); + private final ExecutorService executor = Executors.newFixedThreadPool(5); private HTMLMailAppender(final String name, final Filter filter, final Layout layout, final SmtpManager manager, final boolean ignoreExceptions) { @@ -152,9 +152,9 @@ public final class HTMLMailAppender extends AbstractAppender { @Override public boolean isFiltered(final LogEvent event) { final boolean filtered = super.isFiltered(event); - if (filtered) { - manager.add(event); - } + // if (filtered) { + // manager.add(event); + // } return filtered; } } diff --git a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java index 3852a610..08eb93f8 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/nosql/NoSQLUtils.java @@ -38,7 +38,7 @@ public class NoSQLUtils { public static List asList(BasicDBList obj) { List result = null; - if (obj != null) + if (obj != null && obj.size() > 0) result = Arrays.asList(obj.toArray(new BasicDBObject[obj.size()])); if (result == null) @@ -50,8 +50,18 @@ public class NoSQLUtils { List result = null; if (obj != null) { BasicDBList dbList = asDBList(obj, name); - if (dbList != null) - result = Arrays.asList(dbList.toArray(new BasicDBObject[obj.size()])); + if (dbList != null && dbList.size() > 0) { + Object[] objects = dbList.toArray(); + for (Object listobj : objects) { + if (listobj == null) + continue; + if (result == null) + result = new ArrayList<>(); + result.add((BasicDBObject) listobj); + } + //result = Arrays.asList(dbList.toArray(new BasicDBObject[obj.size()])); + + } } return result; } diff --git a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java index d402724c..a6c535ac 100644 --- a/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java +++ b/server/user.jobengine.osgi.commons/src/user/commons/octopus/OctopusDataMiner.java @@ -62,11 +62,11 @@ public class OctopusDataMiner implements Runnable { private static final String STORY = "story"; private static final String SCHEDULED_START = "scheduledStart"; private static final String SLUGS = "slugs"; - private static final String CHECKING_RUNDOWN = "Checking Rundown %s (%d/%d)"; + private static final String CHECKING_RUNDOWN = "Checking Rundown {} ({}/{})"; private static final String FIELDS_STORIES = "stories,Story.modified,Story.name,Story.id,Story.mosObjects,Story.script,Story.type,Story.format,customColumns,CustomColumn.label,CustomColumn.value"; private static final String FIELDS_SLUGS = "slugs,Slug.story,Slug.position,Story.name,Story.id,Story.modified,Story.mosObjects,Story.script,Story.type,Story.format,Story.customColumns,CustomColumn.label,CustomColumn.value"; private static final String RUNDOWN = "Rundown"; - private static final String FIELDS_RUNDOWN_LIST = "id,name,modified,scheduledStart,slugs,Slug.storyId,Slug.position"; + private static final String FIELDS_RUNDOWN_LIST = "id,name,modified,scheduledStart,rundownType,RundownType.name,slugs,Slug.storyId,Slug.position"; private static final String FIELDS_STORY_FOLDER_LIST = "id,name,modified,stories,Story.id"; private static final String OCTOPUS_DEVICE_NAME = "Octopus-Device-Name"; private static final String OCTOPUS_DEVICE_ID = "Octopus-Device-Id"; @@ -127,6 +127,8 @@ public class OctopusDataMiner implements Runnable { Map result = new HashMap<>(); List rundownsList = NoSQLUtils.asList(rundowns); for (BasicDBObject rundown : rundownsList) { + if (!rundown.containsKey(ID)) + continue; long rundownId = rundown.getLong(ID); List slugs = NoSQLUtils.asList(rundown, SLUGS); if (slugs == null) @@ -141,6 +143,8 @@ public class OctopusDataMiner implements Runnable { result.put(storyId, references); } long position = slug.getLong(POSITION); + if (slug.containsKey(POSITION)) + position = slug.getLong(POSITION); references.add(new BasicDBObject(ID, rundownId).append(POSITION, position)); } } @@ -539,7 +543,7 @@ public class OctopusDataMiner implements Runnable { logger.trace(ENTER); long rundownID = rundown.getLong(ID); String name = rundown.containsKey(NAME) ? rundown.getString(NAME) : null; - logger.info("Checking rundown {} {}", name, rundown.get(SCHEDULED_START)); + logger.debug("Storing rundown {} {}", name, rundown.get(SCHEDULED_START)); BasicDBObject rundownWithStories = queryRundown(rundownID); BasicDBList stories = NoSQLUtils.asDBList(rundownWithStories, SLUGS); if (stories != null) @@ -559,7 +563,7 @@ public class OctopusDataMiner implements Runnable { List rundownsList = NoSQLUtils.asList(rundowns); int idx = 1; for (BasicDBObject rundown : rundownsList) { - logger.debug(String.format(CHECKING_RUNDOWN, rundown.getLong(ID), rundownsList.size(), idx)); + //logger.debug(CHECKING_RUNDOWN, rundown.getLong(ID), rundownsList.size(), idx); storeRundown(rundown, lastUpdateTime); int progress = idx * 50 / rundownsList.size(); if (progress - progressEvent.getProgress() > 0) { @@ -658,7 +662,8 @@ public class OctopusDataMiner implements Runnable { storyFolder.put(MODIFIED, toDate(storyFolder, MODIFIED)); DBCollection collection = db.getCollection(STORY_FOLDER_COLLECTION_NAME); if (lastUpdateTime == null || (lastUpdateTime != null && isModified(lastUpdateTime, storyFolder))) { - logger.trace(String.format("saving storyFolder %d", storyFolderID)); + String name = storyFolder.getString(NAME); + logger.debug("Storing story folder {}", name); collection.save(storyFolder); } logger.trace(EXIT); diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java index cec5021b..1be00f5a 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobRuntime.java @@ -508,7 +508,7 @@ public class JobRuntime extends Job implements IJobRuntime { @Override public String toString() { - return String.format("[JOB %s %s %d %s]", getId(), getTemplate(), getIp(), getStatus()); + return String.format("!%s! %d", getName(), getId()); } } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java index 770202e0..1c540e22 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/JobStepExecutor.java @@ -38,7 +38,7 @@ public class JobStepExecutor implements IJobStepExecutor { step = createStepObject(); if (step == null) throw new Exception("Step object is null"); - logger.info("Executing job {}-{}, step {} ({})", jobRuntime.getId(), jobRuntime.getName(), step.getClass().getSimpleName(), getName()); + logger.info("Executing {}", jobRuntime); //TODO ez biztosan kell? //jobRuntime.IncrementPriority(); @@ -49,7 +49,7 @@ public class JobStepExecutor implements IJobStepExecutor { jobEngine.sendMessage(new JobStepCompletedMessage(jobRuntime.getId(), outputs)); } } catch (Exception e) { - logger.error("Error executing job {}-{} ({})", jobRuntime.getId(), jobRuntime.getName(), getName()); + logger.error("Error in {}", jobRuntime); Throwable t = e.getCause() == null ? e : e.getCause(); logger.catching(t); jobEngine.suspendJob(t, jobRuntime); @@ -73,7 +73,7 @@ public class JobStepExecutor implements IJobStepExecutor { } } - private static final Logger logger = LogManager.getLogger(); + private Logger logger; private PriorityBlockingQueue queue; private List workers; protected IJobEngine jobEngine; @@ -113,7 +113,8 @@ public class JobStepExecutor implements IJobStepExecutor { @Override @SuppressWarnings("unchecked") public void create(String className, int maxConcurrent) throws JobEngineException { - logger.debug("Creating executor: " + className + ", concurrent instances: " + maxConcurrent); + logger = LogManager.getLogger(getClass().getSimpleName() + ":" + className); + logger.debug("Creating executor {}, instances {}", className, maxConcurrent); if (StringUtils.isEmpty(className)) throw new JobEngineException("Step class name can't be null."); // throw new diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/StatusMachine.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/StatusMachine.java index 19f5177e..220e02b9 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/StatusMachine.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/actions/StatusMachine.java @@ -30,8 +30,7 @@ public class StatusMachine implements IStatusMachine { StatusMachineAction machineAction = new StatusMachineAction(jobAction, jobRuntime.getStatus()); if (actions.containsKey(machineAction)) { IJobStatusAction action = actions.get(machineAction); - logger.info("Job {}-{} status change {} -> {} using {}", jobRuntime.getId(), jobRuntime.getName(), jobRuntime.getStatus(), jobAction, - action.getClass().getSimpleName()); + logger.debug("New status at {} ({} -> {})", jobRuntime, jobRuntime.getStatus(), jobAction); action.processAction(jobEngine, jobRuntime); } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/ScheduledJob.java b/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/ScheduledJob.java index a90e61fe..2c3eff85 100644 --- a/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/ScheduledJob.java +++ b/server/user.jobengine.osgi.server/src/user/jobengine/server/scheduler/ScheduledJob.java @@ -118,6 +118,6 @@ public class ScheduledJob extends NativeJob { //implements InterruptableJob{ @Override public String toString() { - return String.format("job { id: %s, template: %s, name %s }", jobId, templateName, jobName); + return String.format("!%s! %s", jobName, templateName); } }