Merge pull request #6879 from crobibero/client-log-cleanup

Remove ClientLog endpoints

2 files changed, 1 insertions, 33 deletions

diff --git a/MediaBrowser.Controller/ClientEvent/ClientEventLogger.cs b/MediaBrowser.Controller/ClientEvent/ClientEventLogger.cs
index 82b5b4593..dea1c2f32 100644
--- a/MediaBrowser.Controller/ClientEvent/ClientEventLogger.cs
+++ b/MediaBrowser.Controller/ClientEvent/ClientEventLogger.cs
@@ -1,48 +1,24 @@
 using System;
 using System.IO;
 using System.Threading.Tasks;
-using MediaBrowser.Model.ClientLog;
-using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.ClientEvent
 {
     /// <inheritdoc />
     public class ClientEventLogger : IClientEventLogger
     {
-        private const string LogString = "[{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz}] [{Level}] [{ClientName}:{ClientVersion}]: UserId: {UserId} DeviceId: {DeviceId}{NewLine}{Message}";
-        private readonly ILogger<ClientEventLogger> _logger;
         private readonly IServerApplicationPaths _applicationPaths;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ClientEventLogger"/> class.
         /// </summary>
-        /// <param name="logger">Instance of the <see cref="ILogger{ClientEventLogger}"/> interface.</param>
         /// <param name="applicationPaths">Instance of the <see cref="IServerApplicationPaths"/> interface.</param>
-        public ClientEventLogger(
-            ILogger<ClientEventLogger> logger,
-            IServerApplicationPaths applicationPaths)
+        public ClientEventLogger(IServerApplicationPaths applicationPaths)
         {
-            _logger = logger;
             _applicationPaths = applicationPaths;
         }
 
         /// <inheritdoc />
-        public void Log(ClientLogEvent clientLogEvent)
-        {
-            _logger.Log(
-                LogLevel.Critical,
-                LogString,
-                clientLogEvent.Timestamp,
-                clientLogEvent.Level.ToString(),
-                clientLogEvent.ClientName,
-                clientLogEvent.ClientVersion,
-                clientLogEvent.UserId ?? Guid.Empty,
-                clientLogEvent.DeviceId,
-                Environment.NewLine,
-                clientLogEvent.Message);
-        }
-
-        /// <inheritdoc />
         public async Task<string> WriteDocumentAsync(string clientName, string clientVersion, Stream fileContents)
         {
             var fileName = $"upload_{clientName}_{clientVersion}_{DateTime.UtcNow:yyyyMMddHHmmss}_{Guid.NewGuid():N}.log";
diff --git a/MediaBrowser.Controller/ClientEvent/IClientEventLogger.cs b/MediaBrowser.Controller/ClientEvent/IClientEventLogger.cs
index 34968d493..ad8a1bd24 100644
--- a/MediaBrowser.Controller/ClientEvent/IClientEventLogger.cs
+++ b/MediaBrowser.Controller/ClientEvent/IClientEventLogger.cs
@@ -1,7 +1,5 @@
 using System.IO;
 using System.Threading.Tasks;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.ClientLog;
 
 namespace MediaBrowser.Controller.ClientEvent
 {
@@ -11,12 +9,6 @@ namespace MediaBrowser.Controller.ClientEvent
     public interface IClientEventLogger
     {
         /// <summary>
-        /// Logs the event from the client.
-        /// </summary>
-        /// <param name="clientLogEvent">The client log event.</param>
-        void Log(ClientLogEvent clientLogEvent);
-
-        /// <summary>
         /// Writes a file to the log directory.
         /// </summary>
         /// <param name="clientName">The client name writing the document.</param>