From 4170c66592a85e1376b70375b7d8bb65ae91ec3e Mon Sep 17 00:00:00 2001
From: Frank Wagner <frank2568@gmail.com>
Date: Mon, 27 Feb 2023 21:31:03 +0100
Subject: [PATCH] fix: use sub directories for path selectors

---
 .../DefaultRebusDataBusSelector.cs                             | 3 ++-
 .../Rebus.Configuration.Selectors/DefaultSagaStoreSelector.cs  | 3 ++-
 .../DefaultTimeoutStoreSelector.cs                             | 3 ++-
 .../Rebus.Configuration.Selectors/DefaultTransportSelector.cs  | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultRebusDataBusSelector.cs b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultRebusDataBusSelector.cs
index b99e6b6..d1f4cc4 100644
--- a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultRebusDataBusSelector.cs
+++ b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultRebusDataBusSelector.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -35,7 +36,7 @@ protected override void ConfigureByType(string busType, StandardConfigurer<IData
 
                 if (path == null)
                     throw new InvalidOperationException($"Missing configuration entry for {ConfigurationName}::path.");
-                configurer.StoreInFileSystem(path);
+                configurer.StoreInFileSystem(Path.Combine(path, "databus"));
                 return;
 
             case "inmemory":
diff --git a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultSagaStoreSelector.cs b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultSagaStoreSelector.cs
index 4cc6771..48c7ffb 100644
--- a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultSagaStoreSelector.cs
+++ b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultSagaStoreSelector.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -36,7 +37,7 @@ protected override void ConfigureByType(string busType, StandardConfigurer<ISaga
                 if(path == null)
                     throw new InvalidOperationException($"Missing configuration entry for {ConfigurationName}::path.");
 
-                configurer.UseFilesystem(path);
+                configurer.UseFilesystem(Path.Combine(path, "sagas"));
                 return;
         }
     }
diff --git a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
index 3ff9d48..ab0fa7f 100644
--- a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
+++ b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTimeoutStoreSelector.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
 using Rebus.Config;
@@ -31,7 +32,7 @@ protected override void ConfigureByType(string busType, StandardConfigurer<ITime
                 if(path == null)
                     throw new InvalidOperationException($"Missing configuration entry for {ConfigurationName}::path.");
 
-                configurer.UseFileSystem(path);
+                configurer.UseFileSystem(Path.Combine(path, "timeouts"));
                 break;
         }
     }
diff --git a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTransportSelector.cs b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTransportSelector.cs
index c2a2f7a..a1a7ed9 100644
--- a/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTransportSelector.cs
+++ b/src/Rebus.Configuration/Rebus.Configuration.Selectors/DefaultTransportSelector.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Logging;
@@ -31,7 +32,7 @@ protected override void ConfigureBusType(string busType, string queueName, Stand
                 if (path == null)
                     throw new InvalidOperationException($"Missing configuration entry for {ConfigurationName}::path.");
 
-                configurer.UseFileSystem(path, queueName);
+                configurer.UseFileSystem(Path.Combine(path, "transport"), queueName);
                 return;
             case "inmemory":
                 configurer.UseInMemoryTransport(_network, queueName);