aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/System/SystemService.cs
diff options
context:
space:
mode:
authorLogicalPhallacy <44458166+LogicalPhallacy@users.noreply.github.com>2019-01-05 16:22:18 -0800
committerGitHub <noreply@github.com>2019-01-05 16:22:18 -0800
commit8ff89fdc0c30f595a171ffc550f907ef22b6212a (patch)
tree6bae45c12ea8530e5af2ceaceaa50e715ea7087c /MediaBrowser.Api/System/SystemService.cs
parent4eaeee7be24a35e697731da1403c12df8f4f753a (diff)
parentb39585cbf6ccc519161e8f6420daaa046a26bf32 (diff)
Merge pull request #5 from jellyfin/dev
Dev
Diffstat (limited to 'MediaBrowser.Api/System/SystemService.cs')
-rw-r--r--MediaBrowser.Api/System/SystemService.cs10
1 files changed, 5 insertions, 5 deletions
diff --git a/MediaBrowser.Api/System/SystemService.cs b/MediaBrowser.Api/System/SystemService.cs
index d2880f735..52e14dbcc 100644
--- a/MediaBrowser.Api/System/SystemService.cs
+++ b/MediaBrowser.Api/System/SystemService.cs
@@ -9,12 +9,11 @@ using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
-
-using MediaBrowser.Controller.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Services;
using System.Threading;
+using Microsoft.Extensions.Logging;
namespace MediaBrowser.Api.System
{
@@ -137,11 +136,12 @@ namespace MediaBrowser.Api.System
try
{
- files = _fileSystem.GetFiles(_appPaths.LogDirectoryPath, new[] { ".txt" }, true, false);
+ files = _fileSystem.GetFiles(_appPaths.LogDirectoryPath, new[] { ".txt", ".log" }, true, false);
}
- catch (IOException)
+ catch (IOException ex)
{
- files = new FileSystemMetadata[] { };
+ Logger.LogError(ex, "Error getting logs");
+ files = Enumerable.Empty<FileSystemMetadata>();
}
var result = files.Select(i => new LogFile