From c16f464a3e775285d2aabe220ce0ef326d233cee Mon Sep 17 00:00:00 2001
From: phanes <phanes@forge.silogroup.lan>
Date: Sun, 23 Jan 2022 02:44:15 -0500
Subject: [PATCH] fixing interpolation

---
 src/loaders/abstract/Conf.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/loaders/abstract/Conf.cpp b/src/loaders/abstract/Conf.cpp
index 3950995..62e04c6 100644
--- a/src/loaders/abstract/Conf.cpp
+++ b/src/loaders/abstract/Conf.cpp
@@ -91,6 +91,7 @@ Conf::Conf(std::string filename, int LOG_LEVEL ): JSON_Loader(LOG_LEVEL ), slog(
     // find the path to the unit definitions file
     if (this->get_string(jval_s, "units_path") != 0 )
     { throw ConfigLoadException("units_path string is not set in the config file supplied: " + filename); } else {
+        interpolate( jval_s );
         this->units_path = jval_s;
     }
     jval_s = {0};
@@ -98,6 +99,7 @@ Conf::Conf(std::string filename, int LOG_LEVEL ): JSON_Loader(LOG_LEVEL ), slog(
     // find the path to logs directory
     if (this->get_string(jval_s, "logs_path") != 0 )
     { throw ConfigLoadException("logs_path string is not set in the config file supplied: " + filename); } else {
+        interpolate( jval_s );
         this->logs_path = jval_s;
     }
     jval_s = {0};
@@ -110,15 +112,13 @@ Conf::Conf(std::string filename, int LOG_LEVEL ): JSON_Loader(LOG_LEVEL ), slog(
 
     if (this->get_string(jval_s, "execution_context") != 0 )
     { throw ConfigLoadException("execution_context string is not set in the config file supplied: " + filename); } else {
-            interpolate( this->execution_context );
+            interpolate( jval_s );
             if ( ! is_dir( jval_s ) ) { throw ConfigLoadException( "The execution context supplied is an invalid directory."); } else {
                 this->execution_context = jval_s;
             }
     }
     jval_s = {0};
 
-    interpolate( this->units_path );
-    interpolate( this->logs_path );
 
 
 };