aboutsummaryrefslogtreecommitdiffstats
path: root/src/Main.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main.cxx')
-rw-r--r--src/Main.cxx13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/Main.cxx b/src/Main.cxx
index 3a40f0bb0..edd670763 100644
--- a/src/Main.cxx
+++ b/src/Main.cxx
@@ -71,6 +71,7 @@
#include "db/DatabaseSimple.hxx"
#include "db/plugins/SimpleDatabasePlugin.hxx"
#include "storage/Configured.hxx"
+#include "storage/CompositeStorage.hxx"
#endif
#ifdef ENABLE_NEIGHBOR_PLUGINS
@@ -148,8 +149,16 @@ glue_mapper_init(Error &error)
static bool
InitStorage(Error &error)
{
- instance->storage = CreateConfiguredStorage(error);
- return !error.IsDefined();
+ Storage *storage = CreateConfiguredStorage(error);
+ if (storage == nullptr)
+ return !error.IsDefined();
+
+ assert(!error.IsDefined());
+
+ CompositeStorage *composite = new CompositeStorage();
+ instance->storage = composite;
+ composite->Mount("", storage);
+ return true;
}
/**