Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
020ddd59
Commit
020ddd59
authored
7 months ago
by
Fabian Reister
Browse files
Options
Downloads
Patches
Plain Diff
DiskMemoryItemMixin: allow memoryBasePath to contain environment variables
parent
208dca3f
No related branches found
No related tags found
Loading
Checking pipeline status
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/armem/server/ltm/detail/mixins/DiskStorageMixin.cpp
+12
-7
12 additions, 7 deletions
...aries/armem/server/ltm/detail/mixins/DiskStorageMixin.cpp
with
12 additions
and
7 deletions
source/RobotAPI/libraries/armem/server/ltm/detail/mixins/DiskStorageMixin.cpp
+
12
−
7
View file @
020ddd59
...
...
@@ -12,6 +12,7 @@
// ArmarX
#include
<ArmarXCore/core/exceptions/LocalException.h>
#include
<ArmarXCore/core/logging/Logging.h>
#include
<ArmarXCore/core/system/ArmarXDataPath.h>
#include
<ArmarXCore/core/time/TimeUtil.h>
namespace
armarx
::
armem
::
server
::
ltm
::
detail
::
mixin
...
...
@@ -69,13 +70,17 @@ namespace armarx::armem::server::ltm::detail::mixin
Path
DiskMemoryItemMixin
::
getMemoryBasePath
()
const
{
if
(
memoryBasePathString
.
empty
()){
return
memoryBasePath
;
}
else
{
std
::
filesystem
::
path
newPath
;
newPath
.
assign
(
memoryBasePathString
);
return
newPath
;
}
std
::
string
p
=
[
&
](){
if
(
memoryBasePathString
.
empty
()){
return
memoryBasePath
.
string
();
}
return
memoryBasePathString
;
}();
ArmarXDataPath
::
ReplaceEnvVars
(
p
);
return
p
;
}
Path
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment