Merge pull request #8 from drdk/feature-link-to-logfile

added logpath to status page

Author: ongobongo

ffmpeg-farm-client/Worker/Node.cs

@@ -294,7 +294,11 @@ private void WriteOutputToLogfile()
                 if (string.IsNullOrWhiteSpace(_logfilesPath) || !Directory.Exists(_logfilesPath))
                     return;
 
-                string logPath = Path.Combine(_logfilesPath, $@"task_{_currentTask.Id}_output.txt");
+                var path = Path.Combine(_logfilesPath, _currentTask.Started.Value.ToString("yyyy"), _currentTask.Started.Value.ToString("MM"), _currentTask.Started.Value.ToString("dd"));
+
+                Directory.CreateDirectory(path);
+                
+                string logPath = Path.Combine(path, $@"task_{_currentTask.Id}_output.txt");
                 using (Stream file = File.Create(logPath))
                 {
                     using (var logWriter = new StreamWriter(file))

ffmpeg-farm-server/API.WindowsService/App.Release.config

@@ -2,4 +2,8 @@
 <!-- For more information on using transformations 
      see the web.config examples at http://go.microsoft.com/fwlink/?LinkId=214134. -->
 <configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
+  <appSettings>
+    <add key="FFmpegLogPath" value="\\onddata.net.dr.dk\cache$\MediaCache\ffmpeg-farm\logfiles\"
+         xdt:Locator="Match(key)" xdt:Transform="SetAttributes" />
+  </appSettings>
 </configuration>

ffmpeg-farm-server/API.WindowsService/App.config

@@ -5,6 +5,7 @@
     <add key="TimeoutSeconds" value="30" />
     <add key="WorkerNonResponsiveAlertMinutes" value="10" />
     <add key="TranscodeToLocalDisk" value="true"/>
+    <add key="FFmpegLogPath" value="\\ondnas01.net.dr.dk\MediaCache\ffmpeg-farm\logfiles\"/>
   </appSettings>
   <connectionStrings>
     <add name="mssql" connectionString="Data Source=.;Initial Catalog=ffmpegfarm;Integrated Security=true;MultipleActiveResultSets=True" />

ffmpeg-farm-server/API.WindowsService/Controllers/StatusController.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -19,6 +20,7 @@ public class StatusController : ApiController
     {
         private readonly IJobRepository _repository;
         private readonly IHelper _helper;
+        private static readonly string _logPath = ConfigurationManager.AppSettings["FFmpegLogPath"];
 
         public StatusController(IJobRepository repository, IHelper helper)
         {
@@ -103,8 +105,9 @@ private static FfmpegJobModel MapDtoToModel(FFmpegJobDto dto)
                     HeartbeatMachine = j.HeartbeatMachineName,
                     State = j.State,
                     Progress = Math.Round(Convert.ToDecimal(j.Progress / j.DestinationDurationSeconds * 100), 2, MidpointRounding.ToEven),
-                    DestinationFilename = j.DestinationFilename
-                }),
+                    DestinationFilename = j.DestinationFilename,
+                    LogPath = j.Started != null ?  $@"{_logPath}{j.Started.Value.Date:yyyy\\MM\\dd}\task_{j.Id}_output.txt" : string.Empty
+            }),
             };
         }
     }

ffmpeg-farm-server/Contract/Models/FfmpegTaskModel.cs

@@ -14,5 +14,6 @@ public class FfmpegTaskModel
 
         public string DestinationFilename { get; set; }
         public DateTimeOffset? Started { get; set; }
+        public string LogPath { get; set; } 
     }
 }