Fixed an issue with storage file paths not working properly on linux / osx.

niemyjski · niemyjski · commit 982a771b7a7d · 2016-06-07T17:15:00.000-05:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -6,8 +6,8 @@ configuration: Release
 pull_requests:
   do_not_increment_build_number: true
   
-#environment:
-#  VERSION_SUFFIX: -preview
+environment:
+  VERSION_SUFFIX: -beta
 
 init: 
   - git config --global core.autocrlf true
diff --git a/src/Exceptionless.Tests/Configuration/ConfigurationTests.cs b/src/Exceptionless.Tests/Configuration/ConfigurationTests.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using Exceptionless.Configuration;
 using Exceptionless.Dependency;
 using Exceptionless.Models;
@@ -86,8 +87,9 @@ public void CanUpdateSettingsFromServer() {
             Assert.Equal(3, client.Configuration.Settings.Count);
 
             var storage = config.Resolver.GetFileStorage() as InMemoryObjectStorage;
+            Assert.NotNull(storage);
             Assert.NotNull(config.GetQueueName());
-            Assert.True(storage.Exists(config.GetQueueName() + "\\server-settings.json"));
+            Assert.True(storage.Exists(Path.Combine(config.GetQueueName(), "server-settings.json")));
 
             config.Settings.Clear();
             config.ApplySavedServerSettings();
diff --git a/src/Exceptionless.Tests/Storage/FileStorageTestsBase.cs b/src/Exceptionless.Tests/Storage/FileStorageTestsBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -32,8 +33,8 @@ public void CanManageFiles() {
             Assert.True(storage.GetObjectList().Any(f => f.Path == "new.txt"));
             storage.DeleteObject("new.txt");
             Assert.Equal(0, storage.GetObjectList().Count());
-            storage.SaveObject("test\\q\\" + Guid.NewGuid().ToString("N") + ".txt", "test");
-            Assert.Equal(1, storage.GetObjectList("test\\q\\*.txt").Count());
+            storage.SaveObject(Path.Combine("test", "q", Guid.NewGuid().ToString("N") + ".txt"), "test");
+            Assert.Equal(1, storage.GetObjectList(Path.Combine("test","q", "*.txt")).Count());
             Assert.Equal(1, storage.GetObjectList("*", null, DateTime.Now).Count());
             List<ObjectInfo> files = storage.GetObjectList("*", null, DateTime.Now.Subtract(TimeSpan.FromMinutes(5))).ToList();
             Debug.WriteLine(String.Join(",", files.Select(f => f.Path + " " + f.Created)));
@@ -51,7 +52,7 @@ public void CanManageQueue() {
             var ev = new Event { Type = Event.KnownTypes.Log, Message = "test" };
             storage.Enqueue(queueName, ev);
             storage.SaveObject("test.txt", "test");
-            Assert.True(storage.GetObjectList().Any(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("0.json")));
+            Assert.True(storage.GetObjectList().Any(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("0.json")));
             Assert.Equal(2, storage.GetObjectList().Count());
 
             Assert.True(storage.GetQueueFiles(queueName).All(f => f.Path.EndsWith("0.json")));
@@ -67,7 +68,7 @@ public void CanManageQueue() {
             var batch = storage.GetEventBatch(queueName, serializer);
             Assert.Equal(1, batch.Count);
 
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("1.json.x")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("1.json.x")));
             Assert.Equal(1, storage.GetObjectList().Count());
 
             Assert.Equal(0, storage.GetQueueFiles(queueName).Count());
@@ -76,26 +77,26 @@ public void CanManageQueue() {
             Assert.False(storage.LockFile(storage.GetObjectList().FirstOrDefault()));
 
             storage.ReleaseBatch(batch);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("1.json")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("1.json")));
             Assert.Equal(1, storage.GetObjectList().Count());
             Assert.Equal(1, storage.GetQueueFiles(queueName).Count());
 
             var file = storage.GetObjectList().FirstOrDefault();
             storage.IncrementAttempts(file);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("2.json")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("2.json")));
             storage.IncrementAttempts(file);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("3.json")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("3.json")));
 
             Assert.True(storage.LockFile(file));
             Assert.NotNull(file);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("3.json.x")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("3.json.x")));
             Thread.Sleep(TimeSpan.FromMilliseconds(1));
             storage.ReleaseStaleLocks(queueName, TimeSpan.Zero);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("3.json")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("3.json")));
 
             batch = storage.GetEventBatch(queueName, serializer);
             Assert.Equal(1, batch.Count);
-            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(queueName + "\\q\\") && f.Path.EndsWith("4.json.x")));
+            Assert.True(storage.GetObjectList().All(f => f.Path.StartsWith(Path.Combine(queueName, "q")) && f.Path.EndsWith("4.json.x")));
             storage.DeleteBatch(batch);
             Assert.Equal(0, storage.GetQueueFiles(queueName).Count());
 
diff --git a/src/Exceptionless.Tests/Storage/FolderFileStorageTests.cs b/src/Exceptionless.Tests/Storage/FolderFileStorageTests.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.IO;
 using Xunit;
 using Exceptionless.Dependency;
 using Exceptionless.Serializer;
@@ -22,7 +23,7 @@ public void CanUseDataDirectory() {
             var storage = new FolderObjectStorage(resolver, DATA_DIRECTORY_QUEUE_FOLDER);
             Assert.NotNull(storage.Folder);
             Assert.NotEqual(DATA_DIRECTORY_QUEUE_FOLDER, storage.Folder);
-            Assert.True(storage.Folder.EndsWith("Queue\\"), storage.Folder);
+            Assert.True(storage.Folder.EndsWith("Queue" + Path.DirectorySeparatorChar) || storage.Folder.EndsWith("Queue" + Path.AltDirectorySeparatorChar), storage.Folder);
         }
     }
 }
diff --git a/src/Exceptionless.Tests/project.json b/src/Exceptionless.Tests/project.json
@@ -26,7 +26,10 @@
         "xunit.runner.visualstudio": "2.1.0"
     },
     "frameworks": {
-        "net46": {
+        "NET46": {
+            "buildOptions": {
+                "define": [ "NET46" ]
+            },
             "frameworkAssemblies": {
                 "System.Threading.Tasks": "",
                 "System.Runtime": ""
diff --git a/src/Exceptionless/Configuration/SettingsManager.cs b/src/Exceptionless/Configuration/SettingsManager.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.IO;
 using System.Linq;
 using Exceptionless.Dependency;
 using Exceptionless.Logging;
@@ -103,7 +104,8 @@ public static void UpdateSettings(ExceptionlessConfiguration config, int? versio
         }
 
         private static string GetConfigPath(ExceptionlessConfiguration config) {
-            return (config != null ? config.GetQueueName() : String.Empty) + "\\server-settings.json";
+            string queueName = config != null ? config.GetQueueName() : String.Empty;
+            return Path.Combine(queueName ?? String.Empty, "server-settings.json");
         }
     }
 }
diff --git a/src/Exceptionless/Extensions/FileStorageExtensions.cs b/src/Exceptionless/Extensions/FileStorageExtensions.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using Exceptionless.Models;
 using Exceptionless.Storage;
@@ -9,14 +10,14 @@ public static class FileStorageExtensions {
         private static readonly object _lockObject = new object();
 
         public static void Enqueue(this IObjectStorage storage, string queueName, Event ev) {
-            storage.SaveObject(String.Concat(queueName, "\\q\\", Guid.NewGuid().ToString("N"), ".0.json"), ev);
+            storage.SaveObject(Path.Combine(queueName, "q", Guid.NewGuid().ToString("N") + ".0.json"), ev);
         }
 
         public static void CleanupQueueFiles(this IObjectStorage storage, string queueName, TimeSpan? maxAge = null, int? maxAttempts = null) {
             maxAge = maxAge ?? TimeSpan.FromDays(7);
             maxAttempts = maxAttempts ?? 3;
 
-            foreach (var file in storage.GetObjectList(queueName + "\\q\\*", 500).ToList()) {
+            foreach (var file in storage.GetObjectList(Path.Combine(queueName, "q", "*"), 500).ToList()) {
                 if (DateTime.Now.Subtract(file.Created) > maxAge.Value)
                     storage.DeleteObject(file.Path);
                 if (GetAttempts(file) >= maxAttempts.Value)
@@ -25,7 +26,7 @@ public static void CleanupQueueFiles(this IObjectStorage storage, string queueNa
         }
 
         public static ICollection<ObjectInfo> GetQueueFiles(this IObjectStorage storage, string queueName, int? limit = null, DateTime? maxCreatedDate = null) {
-            return storage.GetObjectList(queueName + "\\q\\*.json", limit, maxCreatedDate).OrderByDescending(f => f.Created).ToList();
+            return storage.GetObjectList(Path.Combine(queueName, "q", "*.json"), limit, maxCreatedDate).OrderByDescending(f => f.Created).ToList();
         }
 
         public static bool IncrementAttempts(this IObjectStorage storage, ObjectInfo info) {
@@ -89,7 +90,7 @@ public static void ReleaseStaleLocks(this IObjectStorage storage, string queueNa
             if (!maxLockAge.HasValue)
                 maxLockAge = TimeSpan.FromMinutes(60);
 
-            foreach (var file in storage.GetObjectList(queueName + "\\q\\*.x", 500).ToList().Where(f => f.Modified < DateTime.Now.Subtract(maxLockAge.Value)))
+            foreach (var file in storage.GetObjectList(Path.Combine(queueName, "q", "*.x"), 500).ToList().Where(f => f.Modified < DateTime.Now.Subtract(maxLockAge.Value)))
                 storage.ReleaseFile(file);
         }
 
diff --git a/src/Exceptionless/Storage/FolderObjectStorage.cs b/src/Exceptionless/Storage/FolderObjectStorage.cs
@@ -18,8 +18,8 @@ public FolderObjectStorage(IDependencyResolver resolver, string folder) {
 
             if (!Path.IsPathRooted(folder))
                 folder = Path.GetFullPath(folder);
-            if (!folder.EndsWith("\\"))
-                folder += "\\";
+            if (!folder.EndsWith(Path.DirectorySeparatorChar.ToString()) && !folder.EndsWith(Path.AltDirectorySeparatorChar.ToString()))
+                folder += Path.DirectorySeparatorChar;
 
             Folder = folder;
 
diff --git a/src/Exceptionless/Storage/InMemoryObjectStorage.cs b/src/Exceptionless/Storage/InMemoryObjectStorage.cs
@@ -94,7 +94,12 @@ public IEnumerable<ObjectInfo> GetObjectList(string searchPattern = null, int? l
             if (!maxCreatedDate.HasValue)
                 maxCreatedDate = DateTime.MaxValue;
 
-            var regex = new Regex("^" + Regex.Escape(searchPattern).Replace("\\*", ".*?") + "$");
+
+#if PORTABLE || NETSTANDARD1_2
+            var regex = new Regex("^" + Regex.Escape(searchPattern).Replace("\\*", ".*?").Replace("/*", ".*?") + "$");
+#else
+            var regex = new Regex("^" + Regex.Escape(searchPattern).Replace(Path.DirectorySeparatorChar + "*", ".*?").Replace(Path.AltDirectorySeparatorChar + "*", ".*?") + "$");
+#endif
             lock (_lock)
                 return _storage.Keys.Where(k => regex.IsMatch(k)).Select(k => _storage[k].Item1).Where(f => f.Created <= maxCreatedDate).Take(limit ?? Int32.MaxValue).ToList();
         }
diff --git a/src/Exceptionless/Storage/IsolatedStorageObjectStorage.cs b/src/Exceptionless/Storage/IsolatedStorageObjectStorage.cs
@@ -37,7 +37,7 @@ public IEnumerable<string> GetObjects(string searchPattern = null, int? limit =
             stack.Push(initialDirectory);
             Regex searchPatternRegex = null;
             if (!String.IsNullOrEmpty(searchPattern))
-                searchPatternRegex = new Regex("^" + Regex.Escape(searchPattern).Replace("\\*", ".*?") + "$");
+                searchPatternRegex = new Regex("^" + Regex.Escape(searchPattern).Replace(Path.DirectorySeparatorChar + "*", ".*?").Replace(Path.AltDirectorySeparatorChar + "*", ".*?") + "$");
 
             while (stack.Count > 0) {
                 string dir = stack.Pop();
diff --git a/src/Exceptionless/Utility/PathHelper.cs b/src/Exceptionless/Utility/PathHelper.cs
@@ -21,7 +21,7 @@ public static string ExpandPath(string sourceFile) {
             if (!sourceFile.StartsWith(DATA_DIRECTORY, StringComparison.OrdinalIgnoreCase))
                 return Path.GetFullPath(sourceFile);
 
-#if NET45 || NETSTANDARD1_5
+#if !(PORTABLE || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4)
             string dataDirectory = GetDataDirectory();
             int length = DATA_DIRECTORY.Length;
 
@@ -43,7 +43,7 @@ public static string ExpandPath(string sourceFile) {
 #endif
         }
 
-#if NET45 || NETSTANDARD1_5
+#if !(PORTABLE || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4)
         /// <summary>
         /// Gets the data directory for the |DataDirectory| macro.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System;`
	`2`	`+using System.IO;`
`2`	`3`	`using Xunit;`
`3`	`4`	`using Exceptionless.Dependency;`
`4`	`5`	`using Exceptionless.Serializer;`
`@@ -22,7 +23,7 @@ public void CanUseDataDirectory() {`
`22`	`23`	`var storage = new FolderObjectStorage(resolver, DATA_DIRECTORY_QUEUE_FOLDER);`
`23`	`24`	`Assert.NotNull(storage.Folder);`
`24`	`25`	`Assert.NotEqual(DATA_DIRECTORY_QUEUE_FOLDER, storage.Folder);`
`25`		`- Assert.True(storage.Folder.EndsWith("Queue\\"), storage.Folder);`
	`26`	`+ Assert.True(storage.Folder.EndsWith("Queue" + Path.DirectorySeparatorChar) \|\| storage.Folder.EndsWith("Queue" + Path.AltDirectorySeparatorChar), storage.Folder);`
`26`	`27`	`}`
`27`	`28`	`}`
`28`	`29`	`}`