Explorar o código

add cache file deletion error handling

Luke Pulverenti %!s(int64=9) %!d(string=hai) anos
pai
achega
4deb3017c3

+ 1 - 1
MediaBrowser.Common.Implementations/Logging/NlogManager.cs

@@ -110,7 +110,7 @@ namespace MediaBrowser.Common.Implementations.Logging
 			var logFile = new FileTarget
             {
                 FileName = path,
-                Layout = "${longdate} ${level} - ${logger}: ${message}"
+                Layout = "${longdate} ${level} ${logger}: ${message}"
             };
 
             logFile.Name = "ApplicationLogFile";

+ 16 - 1
MediaBrowser.Common.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs

@@ -128,7 +128,18 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
                 DeleteEmptyFolders(directory);
                 if (!_fileSystem.GetFileSystemEntryPaths(directory).Any())
                 {
-					_fileSystem.DeleteDirectory(directory, false);
+                    try
+                    {
+                        _fileSystem.DeleteDirectory(directory, false);
+                    }
+                    catch (UnauthorizedAccessException ex)
+                    {
+                        _logger.ErrorException("Error deleting directory {0}", ex, directory);
+                    }
+                    catch (IOException ex)
+                    {
+                        _logger.ErrorException("Error deleting directory {0}", ex, directory);
+                    }
                 }
             }
         }
@@ -139,6 +150,10 @@ namespace MediaBrowser.Common.Implementations.ScheduledTasks.Tasks
             {
                 _fileSystem.DeleteFile(path);
             }
+            catch (UnauthorizedAccessException ex)
+            {
+                _logger.ErrorException("Error deleting file {0}", ex, path);
+            }
             catch (IOException ex)
             {
                 _logger.ErrorException("Error deleting file {0}", ex, path);

+ 1 - 1
MediaBrowser.Common.Implementations/Security/PluginSecurityManager.cs

@@ -21,7 +21,7 @@ namespace MediaBrowser.Common.Implementations.Security
     public class PluginSecurityManager : ISecurityManager
     {
         private const string MBValidateUrl = MbAdmin.HttpsUrl + "service/registration/validate";
-        private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/admin/" + "service/appstore/register";
+        private const string AppstoreRegUrl = /*MbAdmin.HttpsUrl*/ "http://mb3admin.com/admin/service/appstore/register";
 
         /// <summary>
         /// The _is MB supporter