add logging dir to config

tritonuas · Apr 17, 2024 · e008eaf · e008eaf
1 parent 33ad4dd
commit e008eaf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 1 deletion.
diff --git a/configs/config.json b/configs/config.json
@@ -1,4 +1,7 @@
 {
+    "logging": {
+        "dir": "/workspaces/obcpp/logs"
+    },
     "network": {
         "mavlink": {
             "connect": "serial:///dev/ttyACM0"

diff --git a/configs/default-config.json b/configs/default-config.json
@@ -1,4 +1,7 @@
 {
+    "logging": {
+        "dir": "/workspaces/obcpp/logs"
+    },
     "network": {
         "gcs": {
             "port": 5010

diff --git a/configs/dev-config.json b/configs/dev-config.json
@@ -1,4 +1,7 @@
 {
+    "logging": {
+        "dir": "/workspaces/obcpp/logs"
+    },
     "network": {
         "mavlink": {
             "connect": "tcp://172.17.0.1:5760"

diff --git a/include/utilities/obc_config.hpp b/include/utilities/obc_config.hpp
@@ -4,6 +4,8 @@
 #include <string>
 
 struct OBCConfig {
+    std::string logging_dir;
+
     std::string network_mavlink_connect;
     int network_gcs_port;
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -14,7 +14,7 @@ int main(int argc, char* argv[]) {
     OBCConfig config(argc, argv);
 
     // TODO: pull logging folder from config
-    initLogging("/workspaces/obcpp/logs", true, argc, argv);
+    initLogging(config.logging_dir, true, argc, argv);
 
     OBC obc(config);
     obc.run();

diff --git a/src/utilities/obc_config.cpp b/src/utilities/obc_config.cpp
@@ -20,6 +20,7 @@ OBCConfig::OBCConfig(int argc, char* argv[]) {
         json configs = json::parse(configStream);
 
         // Set configs
+        this->logging_dir = configs["logging"]["dir"];
         this->network_mavlink_connect = configs["network"]["mavlink"]["connect"];
         this->network_gcs_port = configs["network"]["gcs"]["port"];
     } else {
@@ -29,11 +30,13 @@ OBCConfig::OBCConfig(int argc, char* argv[]) {
 
 void OBCConfig::makeDefault() {
     // Set configs
+    this->logging_dir = "/workspaces/obcpp/logs";
     this->network_mavlink_connect = "tcp://172.17.0.1:5760";
     this->network_gcs_port = 5010;
 
     // Create default configs
     json configs;
+    configs["logging"]["dir"] = this->logging_dir;
     configs["network"]["mavlink"]["connect"] = this->network_mavlink_connect;
     configs["network"]["gcs"]["port"] = this->network_gcs_port;
     std::ofstream configFile(configsPath + "default-config.json");