From 57180248d9356544f1dc736274dd7d51672e52f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Wed, 4 Oct 2017 13:38:23 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C30527 --- client/DxPlay/DxPlay.csproj | 7 ++ client/DxPlay/MediaDetector.cs | 8 +- client/DxPlay/nlog.config | 15 +++ client/DxPlay/packages.config | 4 + .../Maestro/Resources/configuration-unc.json | 4 +- client/Maestro/Targets/FTPTargetProcessor.cs | 2 +- server/-product/log4j2.xml | 76 +++++++++++++ server/-product/mediacube.product | 104 +++++++++--------- server/-product/pom.xml | 14 ++- 9 files changed, 174 insertions(+), 60 deletions(-) create mode 100644 client/DxPlay/nlog.config create mode 100644 client/DxPlay/packages.config create mode 100644 server/-product/log4j2.xml diff --git a/client/DxPlay/DxPlay.csproj b/client/DxPlay/DxPlay.csproj index b92038ed..97c7aa1e 100644 --- a/client/DxPlay/DxPlay.csproj +++ b/client/DxPlay/DxPlay.csproj @@ -124,6 +124,9 @@ False lib\DirectShowLib.dll + + ..\packages\NLog.4.4.12\lib\net45\NLog.dll + System @@ -186,6 +189,10 @@ PlayerForm.cs + + PreserveNewest + + diff --git a/client/DxPlay/MediaDetector.cs b/client/DxPlay/MediaDetector.cs index 7be6354b..0b116be7 100644 --- a/client/DxPlay/MediaDetector.cs +++ b/client/DxPlay/MediaDetector.cs @@ -10,22 +10,23 @@ using DirectShowLib.DES; using MediaInfoLib; using System.Diagnostics; using System.Globalization; +using NLog; namespace DxPlay { /// /// A wrapper class around the DirectShow's MediaDet object. /// public sealed class MediaDetector { - + private static Logger logger = LogManager.GetCurrentClassLogger(); private static CultureInfo USCU = new CultureInfo("en-US"); public static MediaDescription GetDescription(string fileName) { MediaDescription mediaDesc = new MediaDescription(); mediaDesc.fileName = fileName; - + logger.Debug("Start MediaInfo"); MediaInfo MI = new MediaInfo(); MI.Open(fileName); - Debug.WriteLine(MI.Inform()); + //Debug.WriteLine(MI.Inform()); try { setResolution(mediaDesc, MI); mediaDesc.frameRate = float.Parse(MI.Get(StreamKind.Video, 0, "FrameRate"), USCU.NumberFormat); @@ -41,6 +42,7 @@ namespace DxPlay { MI.Close(); } + logger.Debug("Finished MediaInfo"); return mediaDesc; } diff --git a/client/DxPlay/nlog.config b/client/DxPlay/nlog.config new file mode 100644 index 00000000..65416377 --- /dev/null +++ b/client/DxPlay/nlog.config @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/client/DxPlay/packages.config b/client/DxPlay/packages.config new file mode 100644 index 00000000..7d41141a --- /dev/null +++ b/client/DxPlay/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/client/Maestro/Resources/configuration-unc.json b/client/Maestro/Resources/configuration-unc.json index 8dfcfc2d..48fa4693 100644 --- a/client/Maestro/Resources/configuration-unc.json +++ b/client/Maestro/Resources/configuration-unc.json @@ -23,7 +23,7 @@ { "$type": "OctopusMetadata", "server": { - "address": "http://localhost:8080/services/rest/octopus/", + "address": "http://10.10.1.28:8080/services/rest/octopus/", "userName": "dani", "password": "dani", "timeout": 1000 @@ -41,7 +41,7 @@ { "$type": "MediaCubeMetadata", "server": { - "address": "http://localhost:8080/services/rest/jobengine/", + "address": "http://10.10.1.28:8080/services/rest/jobengine/", "userName": "dani", "password": "dani" } diff --git a/client/Maestro/Targets/FTPTargetProcessor.cs b/client/Maestro/Targets/FTPTargetProcessor.cs index 636bfd1e..4c39ade1 100644 --- a/client/Maestro/Targets/FTPTargetProcessor.cs +++ b/client/Maestro/Targets/FTPTargetProcessor.cs @@ -167,7 +167,7 @@ namespace Maestro.Targets { } protected virtual string CreateOutputFileName() { - string nameWithoutExtension = String.Format(targetConfig.OutputFormat, ID, Path.GetFileNameWithoutExtension(inputFile.Name)); + string nameWithoutExtension = targetConfig.OutputFormat.Replace("%ID%", ID).Replace("%SOURCENAME%", Path.GetFileNameWithoutExtension(inputFile.Name)); string result = String.Format(FILENAME, nameWithoutExtension, inputFile.Extension); int version = 1; if (targetFTP != null) diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml new file mode 100644 index 00000000..05196b3a --- /dev/null +++ b/server/-product/log4j2.xml @@ -0,0 +1,76 @@ + + + + log/mediacube.log + log/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz + log/markered-mediacube.log + log/$${date:yyyy-MM}/markered-mediacube-%d{MM-dd-yyyy}-%i.log.gz + log/mediacube-err.log + log/$${date:yyyy-MM}/mediacube-err-%d{MM-dd-yyyy}-%i.log.gz + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +- +- +- + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/-product/mediacube.product b/server/-product/mediacube.product index ba6a0128..0b6c7938 100644 --- a/server/-product/mediacube.product +++ b/server/-product/mediacube.product @@ -9,64 +9,64 @@ -consoleLog -console - -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 + -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.21/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.21/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 3654ebc0..1bd08ab1 100644 --- a/server/-product/pom.xml +++ b/server/-product/pom.xml @@ -58,11 +58,16 @@ ${basedir}/../-configuration - log4j2.xml scheduledjobs.json dsm.opt + + ${basedir} + + log4j2.xml + + @@ -78,11 +83,16 @@ ${basedir}/../-configuration - log4j2.xml scheduledjobs.json dsm.opt + + ${basedir} + + log4j2.xml + + -- 2.54.0