From 4ad96e4ff5756ddb235a061231469b30c1ff984d Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 4 Oct 2015 18:04:56 -0400
Subject: update logging levels

---
 MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs | 2 +-
 MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs       | 2 +-
 .../HttpServer/Security/AuthService.cs                              | 2 +-
 .../HttpServer/Security/AuthorizationContext.cs                     | 6 +++++-
 .../HttpServer/SocketSharp/WebSocketSharpListener.cs                | 2 +-
 MediaBrowser.Server.Implementations/Session/SessionManager.cs       | 6 ++++--
 6 files changed, 13 insertions(+), 7 deletions(-)

(limited to 'MediaBrowser.Server.Implementations')

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
index 976fa56153..0321af66b3 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelPostScanTask.cs
@@ -143,7 +143,7 @@ namespace MediaBrowser.Server.Implementations.Channels
 
         private async Task CleanChannel(Guid id, CancellationToken cancellationToken)
         {
-            _logger.Debug("Cleaning channel {0} from database", id);
+            _logger.Info("Cleaning channel {0} from database", id);
 
             // Delete all channel items
             var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
diff --git a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
index 5558c24d73..f038591aa7 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/LoggerUtils.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
 
             var msg = "HTTP Response " + statusCode + " to " + endPoint + responseTime;
 
-            logger.LogMultiline(msg, LogSeverity.Debug, log);
+            logger.LogMultiline(msg, LogSeverity.Info, log);
         }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
index b4da407026..f6b14fcab3 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthService.cs
@@ -220,7 +220,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
         {
             if (string.IsNullOrWhiteSpace(token))
             {
-                throw new SecurityException("Access token is invalid or expired.");
+                throw new SecurityException("Access token is required.");
             }
 
             var info = GetTokenInfo(request);
diff --git a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
index ae5ce796ea..509a00ff9b 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/Security/AuthorizationContext.cs
@@ -62,8 +62,12 @@ namespace MediaBrowser.Server.Implementations.HttpServer.Security
                 auth.TryGetValue("Version", out version);
             }
 
-            var token = httpReq.Headers["X-MediaBrowser-Token"];
+            var token = httpReq.Headers["X-Emby-Token"];
 
+            if (string.IsNullOrWhiteSpace(token))
+            {
+                token = httpReq.Headers["X-MediaBrowser-Token"];
+            }
             if (string.IsNullOrWhiteSpace(token))
             {
                 token = httpReq.QueryString["api_key"];
diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
index fdb27d40db..f8178c1155 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
@@ -191,7 +191,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
 
             var type = request.IsWebSocketRequest ? "Web Socket" : "HTTP " + request.HttpMethod;
 
-            logger.LogMultiline(type + " " + request.Url, LogSeverity.Debug, log);
+            logger.LogMultiline(type + " " + request.Url, LogSeverity.Info, log);
         }
 
         private void HandleError(Exception ex, HttpListenerContext context)
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index d164874dc9..8d32734217 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -1324,7 +1324,7 @@ namespace MediaBrowser.Server.Implementations.Session
             if (existing.Items.Length > 0)
             {
                 var token = existing.Items[0].AccessToken;
-                _logger.Debug("Reissuing access token: " + token);
+                _logger.Info("Reissuing access token: " + token);
                 return token;
             }
 
@@ -1340,7 +1340,7 @@ namespace MediaBrowser.Server.Implementations.Session
                 AccessToken = Guid.NewGuid().ToString("N")
             };
 
-            _logger.Debug("Creating new access token for user {0}", userId);
+            _logger.Info("Creating new access token for user {0}", userId);
             await _authRepo.Create(newToken, CancellationToken.None).ConfigureAwait(false);
 
             return newToken.AccessToken;
@@ -1353,6 +1353,8 @@ namespace MediaBrowser.Server.Implementations.Session
                 throw new ArgumentNullException("accessToken");
             }
 
+            _logger.Info("Logging out access token {0}", accessToken);
+
             var existing = _authRepo.Get(new AuthenticationInfoQuery
             {
                 Limit = 1,
-- 
cgit v1.2.3