git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...
authorVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 4 Oct 2017 13:38:23 +0000 (13:38 +0000)
committerVásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Wed, 4 Oct 2017 13:38:23 +0000 (13:38 +0000)
client/DxPlay/DxPlay.csproj
client/DxPlay/MediaDetector.cs
client/DxPlay/nlog.config [new file with mode: 0644]
client/DxPlay/packages.config [new file with mode: 0644]
client/Maestro/Resources/configuration-unc.json
client/Maestro/Targets/FTPTargetProcessor.cs
server/-product/log4j2.xml [new file with mode: 0644]
server/-product/mediacube.product
server/-product/pom.xml

index b92038ede10eae9589120447088e5417bed99efc..97c7aa1e8a135eb3489b96b50a42936a1e17ddc3 100644 (file)
       <SpecificVersion>False</SpecificVersion>\r
       <HintPath>lib\DirectShowLib.dll</HintPath>\r
     </Reference>\r
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">\r
+      <HintPath>..\packages\NLog.4.4.12\lib\net45\NLog.dll</HintPath>\r
+    </Reference>\r
     <Reference Include="System">\r
       <Name>System</Name>\r
     </Reference>\r
       <DependentUpon>PlayerForm.cs</DependentUpon>\r
     </Compile>\r
     <Content Include="DirectShowLib.dll" />\r
+    <None Include="nlog.config">\r
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
+    </None>\r
+    <None Include="packages.config" />\r
     <None Include="Resources\lgs.jpg" />\r
     <None Include="Resources\Play.png" />\r
     <None Include="Resources\Stop.png" />\r
index 7be6354be0ff5c42803ab9430e27affcb04f0511..0b116be781642566a20a6df4f92356df4b924a30 100644 (file)
@@ -10,22 +10,23 @@ using DirectShowLib.DES;
 using MediaInfoLib;\r
 using System.Diagnostics;\r
 using System.Globalization;\r
+using NLog;\r
 \r
 namespace DxPlay {\r
     /// <summary>\r
     /// A wrapper class around the DirectShow's MediaDet object.\r
     /// </summary>\r
     public sealed class MediaDetector {\r
-\r
+        private static Logger logger = LogManager.GetCurrentClassLogger();\r
         private static CultureInfo USCU = new CultureInfo("en-US");\r
 \r
         public static MediaDescription GetDescription(string fileName) {\r
             MediaDescription mediaDesc = new MediaDescription();\r
             mediaDesc.fileName = fileName;\r
-\r
+            logger.Debug("Start MediaInfo");\r
             MediaInfo MI = new MediaInfo();\r
             MI.Open(fileName);\r
-            Debug.WriteLine(MI.Inform());\r
+            //Debug.WriteLine(MI.Inform());\r
             try {\r
                 setResolution(mediaDesc, MI);\r
                 mediaDesc.frameRate = float.Parse(MI.Get(StreamKind.Video, 0, "FrameRate"), USCU.NumberFormat);\r
@@ -41,6 +42,7 @@ namespace DxPlay {
                 MI.Close();\r
             }\r
 \r
+            logger.Debug("Finished MediaInfo");\r
             return mediaDesc;\r
         }\r
 \r
diff --git a/client/DxPlay/nlog.config b/client/DxPlay/nlog.config
new file mode 100644 (file)
index 0000000..6541637
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>\r
+<!--Bedolgozók naplózásának beállítása-->\r
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" autoReload="true">\r
+  <!--Kimenetek-->\r
+  <targets>\r
+    <target name="t1" xsi:type="Debugger" layout="${date:format=HH\:mm\:ss} ${level} ${logger:shortName=true} | ${message}" />\r
+    <target name="t2" xsi:type="Debugger" layout="ERROR stack: ${stacktrace:format=Raw}" />\r
+    <!--<target name="debug" xsi:type="Debugger" layout="${date:format=yyyy.MM.dd HH\:mm\:ss} ${level} ${message}" />-->\r
+  </targets>\r
+  <!--Naplózási szint-->\r
+  <rules>\r
+    <logger name="*" minlevel="Trace" writeTo="t1" />\r
+    <logger name="*" minlevel="Error" writeTo="t2" />\r
+  </rules>\r
+</nlog>\r
diff --git a/client/DxPlay/packages.config b/client/DxPlay/packages.config
new file mode 100644 (file)
index 0000000..7d41141
--- /dev/null
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<packages>\r
+  <package id="NLog" version="4.4.12" targetFramework="net461" />\r
+</packages>
\ No newline at end of file
index 8dfcfc2decdea054c9ba716782bb79b65f099014..48fa46938ff71b48c3f224a594e29ffa6b5de822 100644 (file)
@@ -23,7 +23,7 @@
     {\r
       "$type": "OctopusMetadata",\r
       "server": {\r
-        "address": "http://localhost:8080/services/rest/octopus/",\r
+        "address": "http://10.10.1.28:8080/services/rest/octopus/",\r
         "userName": "dani",\r
         "password": "dani",\r
         "timeout": 1000\r
@@ -41,7 +41,7 @@
     {\r
       "$type": "MediaCubeMetadata",\r
       "server": {\r
-        "address": "http://localhost:8080/services/rest/jobengine/",\r
+        "address": "http://10.10.1.28:8080/services/rest/jobengine/",\r
         "userName": "dani",\r
         "password": "dani"\r
       }\r
index 636bfd1eb74eb851c2be697f9c15136ccf5b0bf4..4c39ade19997b16fa8b3241c4958c9f71cb6eb73 100644 (file)
@@ -167,7 +167,7 @@ namespace Maestro.Targets {
         }\r
 \r
         protected virtual string CreateOutputFileName() {\r
-            string nameWithoutExtension = String.Format(targetConfig.OutputFormat, ID, Path.GetFileNameWithoutExtension(inputFile.Name));\r
+            string nameWithoutExtension = targetConfig.OutputFormat.Replace("%ID%", ID).Replace("%SOURCENAME%", Path.GetFileNameWithoutExtension(inputFile.Name));\r
             string result = String.Format(FILENAME, nameWithoutExtension, inputFile.Extension);\r
             int version = 1;\r
             if (targetFTP != null)\r
diff --git a/server/-product/log4j2.xml b/server/-product/log4j2.xml
new file mode 100644 (file)
index 0000000..05196b3
--- /dev/null
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<Configuration status="ERROR" monitorInterval="10" packages="user.commons.log4j2.appender">\r
+       <Properties>\r
+               <Property name="fileName">log/mediacube.log</Property>\r
+               <Property name="filePattern">log/$${date:yyyy-MM}/mediacube-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+               <Property name="markeredFileName">log/markered-mediacube.log</Property>\r
+               <Property name="markeredFilePattern">log/$${date:yyyy-MM}/markered-mediacube-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+               <Property name="fileName.err">log/mediacube-err.log</Property>\r
+               <Property name="filePattern.err">log/$${date:yyyy-MM}/mediacube-err-%d{MM-dd-yyyy}-%i.log.gz</Property>\r
+       </Properties>\r
+       <Appenders>\r
+               <Console name="Console" target="SYSTEM_OUT">\r
+                       <Filters>\r
+                               <MarkerFilter marker="teszt1" onMatch="DENY" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt2" onMatch="DENY" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt3" onMatch="DENY" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt4" onMatch="DENY" onMismatch="NEUTRAL" />\r
+                       </Filters>\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />\r
+               </Console>\r
+               <Console name="MarkeredConsole" target="SYSTEM_ERR">\r
+                       <Filters>\r
+                               <MarkerFilter marker="teszt1" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt2" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt3" onMatch="ACCEPT" onMismatch="NEUTRAL" />\r
+                               <MarkerFilter marker="teszt4" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       </Filters>\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %marker - %msg (%F:%L) %n" />\r
+               </Console>\r
+               <HTMLMailAppender name="MarkeredMail" subject="MediaCube rendszerüzenet" to="vasary@elgekko.net" from="mediacubeserver@gmail.com" smtpHost="smtp.gmail.com"\r
+                       smtpPort="465" smtpProtocol="smtps" smtpUsername="mediacubeserver@gmail.com" smtpPassword="salabakter" ignoreExceptions="false" bufferSize="1">\r
+                       <MarkerFilter marker="INFO-MARKER" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} %-5level %logger{1}.%M - %msg (%F:%L) %n" />\r
+               </HTMLMailAppender>\r
+               <RollingFile name="MarkeredRollingFile" fileName="${markeredFileName}" filePattern="${markeredFilePattern}">\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] [%t] [%M] [%class{36}] %msg%n %throwable{short}" />\r
+                       <Policies>\r
+                               <TimeBasedTriggeringPolicy />\r
+                       </Policies>\r
+               </RollingFile>\r
+               <RollingFile name="RollingFile" fileName="${fileName}" filePattern="${filePattern}">\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] [%t] [%M] [%class{36}] %msg%n %throwable{short}" />\r
+                       <Policies>\r
+                               <TimeBasedTriggeringPolicy />\r
+                       </Policies>\r
+               </RollingFile>\r
+               <RollingFile name="RollingFileExceptions" fileName="${fileName.err}" filePattern="${filePattern.err}">\r
+                       <PatternLayout pattern="%d{HH:mm:ss.SSS} [%-5level] [%t] [%M] [%class{36}] %msg%n %throwable{full}" />\r
+                       <Filters>\r
+                               <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY" />\r
+                       </Filters>\r
+                       <Policies>\r
+                               <TimeBasedTriggeringPolicy />\r
+                       </Policies>\r
+               </RollingFile>\r
+       </Appenders>\r
+       <Loggers>\r
+               <Root level="INFO">\r
+                       <AppenderRef ref="Console" />\r
+                       <AppenderRef ref="MarkeredConsole" />\r
+-                      <AppenderRef ref="RollingFile" />\r
+-                      <AppenderRef ref="RollingFileEceptions" />\r
+-                      <AppenderRef ref="MarkeredRollingFile" />\r
+<!--                   <AppenderRef ref="MarkeredMail" /> -->\r
+               </Root>\r
+               <Logger name="org.zkoss" level="ERROR" additivity="false" />\r
+               <Logger name="org.quartz" level="ERROR" additivity="false" />\r
+               <Logger name="org.eclipse.jetty.osgi.boot" level="ERROR" additivity="false" />\r
+\r
+               <logger name="org.jboss.resteasy.core" level="debug" />\r
+               <logger name="org.jboss.resteasy.specimpl" level="debug" />\r
+               <logger name="org.jboss.resteasy.plugins.server" level="debug" />\r
+               <logger name="org.jboss.resteasy.plugins.providers" level="debug" />\r
+<!--           <logger name="user.commons.nexio" level="debug" /> -->\r
+       </Loggers>\r
+</Configuration>
\ No newline at end of file
index ba6a01285db0cb2f2bc7405c1f01473f338b2caa..0b6c7938e71539e80a528bc37ce1f558bd1ee936 100644 (file)
@@ -9,64 +9,64 @@
    <launcherArgs>\r
       <programArgs>-consoleLog -console\r
       </programArgs>\r
-      <vmArgs>-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8888\r
--Djavax.ws.rs.ext.RuntimeDelegate=org.jboss.resteasy.spi.ResteasyProviderFactory\r
-\r
-#System\r
--Dorg.eclipse.equinox.http.jetty.http.port=8080\r
--Dorg.eclipse.epp.logging.aeri.skipReports=true \r
--Declipse.ignoreApp=true \r
--Dosgi.noShutdown=true\r
--Djetty.home=./configuration/jetty\r
--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\r
--Dlog4j.configurationFile=./configuration/log4j2.xml\r
--Djobengine.loglevel=INFO\r
--Djobengine.jobsteps.root=./configuration/executors\r
--Djobengine.jobtemplates.root=./configuration/jobtemplates\r
+      <vmArgs>-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\r
       </vmArgs>\r
-      <vmArgsLin>#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
+      <vmArgsLin>#Database\r
+-Djobengine.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.db.user=db2admin\r
+-Djobengine.db.password=password\r
+-Djobengine.nosql.db.url=jdbc:db2://localhost:50000/mc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.nosql.db.user=db2admin\r
+-Djobengine.nosql.db.password=password\r
+-Djobengine.nosql.db.schema=test\r
+\r
+#Octopus\r
+-Djobengine.octopus.api.address=http://10.10.1.11/api/v1\r
+-Djobengine.octopus.api.user=mam\r
+-Djobengine.octopus.api.password=napocska\r
+\r
+#Selenio\r
+-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl\r
+-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium\r
+\r
+#Nexio\r
 -Dnexio.host=10.10.1.55\r
       </vmArgsLin>\r
       <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts\r
       </vmArgsMac>\r
-      <vmArgsWin>#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
+      <vmArgsWin>#Database\r
+-Djobengine.db.url=jdbc:db2://10.228.198.1:50000/mediaarc:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.db.user=db2admin\r
+-Djobengine.db.password=password\r
+-Djobengine.nosql.db.url=jdbc:db2://10.228.198.1:50000/mccache:retrieveMessagesFromServerOnGetMessage=true;\r
+-Djobengine.nosql.db.user=db2admin\r
+-Djobengine.nosql.db.password=password\r
+-Djobengine.nosql.db.schema=test\r
+\r
+#Octopus\r
+-Djobengine.octopus.api.address=http://10.10.1.11/api/v1\r
+-Djobengine.octopus.api.user=mam\r
+-Djobengine.octopus.api.password=napocska\r
+\r
+#Selenio\r
+-Djobengine.selenio.address=http://10.10.1.71:44000/TranscodeMgrWS?wsdl\r
+-Djobengine.selenio.projectfilepath=\\10.10.1.71\Data\Blueprints\MP4_H264_AAC_v4.zenium\r
+\r
+#Nexio\r
 -Dnexio.host=10.10.1.55\r
       </vmArgsWin>\r
    </launcherArgs>\r
index 3654ebc094289d4f230d052af9f517e27d52cca0..1bd08ab11fb791855b900d074794d276df19014c 100644 (file)
                                                                <resource>\r
                                                                        <directory>${basedir}/../-configuration</directory>\r
                                                                        <includes>\r
-                                                                               <include>log4j2.xml</include>\r
                                                                                <include>scheduledjobs.json</include>\r
                                                                                <include>dsm.opt</include>\r
                                                                        </includes>\r
                                                                </resource>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}</directory>\r
+                                                                       <includes>\r
+                                                                               <include>log4j2.xml</include>\r
+                                                                       </includes>\r
+                                                               </resource>\r
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r
                                                                <resource>\r
                                                                        <directory>${basedir}/../-configuration</directory>\r
                                                                        <includes>\r
-                                                                               <include>log4j2.xml</include>\r
                                                                                <include>scheduledjobs.json</include>\r
                                                                                <include>dsm.opt</include>\r
                                                                        </includes>\r
                                                                </resource>\r
+                                                               <resource>\r
+                                                                       <directory>${basedir}</directory>\r
+                                                                       <includes>\r
+                                                                               <include>log4j2.xml</include>\r
+                                                                       </includes>\r
+                                                               </resource>\r
                                                        </resources>\r
                                                </configuration>\r
                                        </execution>\r