From 53d8828849f9fc2c4241e39d027749d02ac5051b Mon Sep 17 00:00:00 2001
From: armar-user <armar6@kit>
Date: Mon, 15 Nov 2021 08:16:33 +0100
Subject: [PATCH] fixed issues with ltm storage
---
.../libraries/armem/server/ltm/base/detail/MemoryBase.h | 2 +-
.../RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp | 2 --
.../RobotAPI/libraries/armem/server/plugins/Plugin.cpp | 9 +++------
3 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
index 8203fa4cd..0357e6d22 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
+++ b/source/RobotAPI/libraries/armem/server/ltm/base/detail/MemoryBase.h
@@ -93,7 +93,7 @@ namespace armarx::armem::server::ltm
virtual void _store(const armem::wm::Memory& memory) = 0;
public:
- bool enabled = true;
+ bool enabled = false;
protected:
mutable std::recursive_mutex ltm_mutex;
diff --git a/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp b/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp
index 8797b7cd6..6ea2b1b3f 100644
--- a/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp
+++ b/source/RobotAPI/libraries/armem/server/ltm/disk/Memory.cpp
@@ -21,8 +21,6 @@ namespace armarx::armem::server::ltm::disk
{
ARMARX_CHECK(!p.empty());
- util::ensureFolderExists(p);
-
MemoryID m;
m.memoryName = p.filename();
return m;
diff --git a/source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp b/source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp
index 327a83223..5c8387726 100644
--- a/source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp
+++ b/source/RobotAPI/libraries/armem/server/plugins/Plugin.cpp
@@ -32,14 +32,11 @@ namespace armarx::armem::server::plugins
}
// stuff for ltm
- if (longtermMemory.enabled) // if not explicitly set to false in constructor of component (then we dont need the params)
+ if (not properties->hasDefinition(prefix + "ltm.enabled"))
{
- if (not properties->hasDefinition(prefix + "ltm.enabled"))
- {
- properties->optional(longtermMemory.enabled, prefix + "ltm.enabled");
- }
- //longtermMemory.createPropertyDefinitions(properties, "ltm.");
+ properties->optional(longtermMemory.enabled, prefix + "ltm.enabled");
}
+ longtermMemory.createPropertyDefinitions(properties, prefix + "ltm.");
// Publish memory updates topic
properties->topic(memoryTopic, memoryTopicDefaultName);
--
GitLab