Removed config.example.json, creating new in runtime if needed.

Author: shajen

Dockerfile

@@ -55,7 +55,6 @@ CMD ["/usr/bin/auto_sdr_test"]
 FROM run
 RUN mkdir -p /app && \
     mkdir -p /config
-COPY config.example.json /config/
 COPY --from=build /usr/local/lib/libsdrplay_api.so* /usr/local/lib/
 COPY --from=build /usr/local/bin/sdrplay_apiService /usr/local/bin/
 COPY --from=build /usr/local/lib/SoapySDR/modules0.8/libsdrPlaySupport.so /usr/local/lib/SoapySDR/modules0.8/

config.example.json

@@ -1,8 +1,4 @@
 #!/bin/sh
 
-if [ ! -f /app/config.json ]; then
-    echo "Not found /app/config.json - copying default"
-    cp /config/config.example.json /app/config.json
-fi
 sdrplay_apiService &
 /usr/bin/auto_sdr --config /app/config.json --mqtt-url "$MQTT_URL" --mqtt-user "$MQTT_USER" --mqtt-password "$MQTT_PASSWORD"

entrypoint/entrypoint_run.sh

@@ -0,0 +1,14 @@
+#pragma once
+
+#include <string>
+
+struct ArgConfig {
+  std::string configFile;
+  std::string id;
+  std::string logFileName = "sdr_scanner.log";  // default log filename
+  int logFileCount = 9;                         // default keep last n log files
+  int logFileSize = 10 * 1024 * 1024;           // default single log file max size
+  std::string mqttUrl;
+  std::string mqttUser;
+  std::string mqttPassword;
+};

sources/arg_config.h

@@ -38,10 +38,18 @@ Config Config::loadFromFile(const std::string& path, const ArgConfig& argConfig)
       SdrDeviceReader::updateDevices(fileConfig.devices);
       return Config(argConfig, fileConfig);
     } catch (const nlohmann::json::parse_error& exception) {
-      throw std::runtime_error(fmt::format("can not parse config file, invalid json format: {}", path));
+      Logger::info(LABEL, "config parse error, creating default");
+      FileConfig fileConfig;
+      SdrDeviceReader::updateDevices(fileConfig.devices);
+      Config::saveToFile(path, static_cast<nlohmann::json>(fileConfig));
+      return Config(argConfig, fileConfig);
     }
   } else {
-    throw std::runtime_error(fmt::format("can not parse config file, file not found: {}", path));
+    Logger::info(LABEL, "config not found, creating default");
+    FileConfig fileConfig;
+    SdrDeviceReader::updateDevices(fileConfig.devices);
+    Config::saveToFile(path, static_cast<nlohmann::json>(fileConfig));
+    return Config(argConfig, fileConfig);
   }
 }
 

sources/config.cpp

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <arg_config.h>
 #include <file_config.h>
 #include <logger.h>
 #include <radio/help_structures.h>
@@ -35,17 +36,6 @@ constexpr auto SPECTROGRAM_PREFERRED_MAX_STEP = 1000;                        //
 constexpr auto SPECTROGRAM_MAX_FFT = 16384;                                  // spectrogram fft limit
 constexpr auto SPECTROGRAM_SEND_INTERVAL = std::chrono::milliseconds(1000);  // send spectrogram data interval
 
-struct ArgConfig {
-  std::string configFile;
-  std::string id;
-  std::string logFileName = "sdr_scanner.log";  // default log filename
-  int logFileCount = 9;                         // default keep last n log files
-  int logFileSize = 10 * 1024 * 1024;           // default single log file max size
-  std::string mqttUrl;
-  std::string mqttUser;
-  std::string mqttPassword;
-};
-
 class Config {
  public:
   static Config loadFromFile(const std::string& path, const ArgConfig& argConfig);

sources/config.h

@@ -36,14 +36,4 @@ void ConfigMigrator::applyVersion(nlohmann::json& config, const int version) {
   config["version"] = version;
 }
 
-void ConfigMigrator::applyVersion2(nlohmann::json& config) {
-  applyVersion(config, 2);
-  config["api_key"] = "";
-  config["position"]["latitude"] = "0.000000";
-  config["position"]["longitude"] = "0.000000";
-  config["position"]["altitude"] = 0;
-
-  for (auto& device : config.at("devices")) {
-    device["satellites"] = nlohmann::json::array();
-  }
-}
+void ConfigMigrator::applyVersion2(nlohmann::json& config) { std::ignore = config; }

sources/config_migrator.cpp

@@ -13,24 +13,24 @@ struct IgnoredFrequency {
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(IgnoredFrequency, frequency, bandwidth)
 
 struct OutputConfig {
-  bool color_log_enabled;
-  std::string console_log_level;
-  std::string file_log_level;
+  bool color_log_enabled = true;
+  std::string console_log_level = "info";
+  std::string file_log_level = "debug";
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(OutputConfig, color_log_enabled, console_log_level, file_log_level)
 
 struct PositionConfig {
-  std::string latitude;
-  std::string longitude;
-  int altitude;
+  std::string latitude = "0.000000";
+  std::string longitude = "0.000000";
+  int altitude = 0;
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(PositionConfig, latitude, longitude, altitude)
 
 struct RecordingConfig {
-  Frequency min_sample_rate;
-  std::chrono::milliseconds min_time_ms;
-  std::chrono::milliseconds max_noise_time_ms;
-  Frequency step;
+  Frequency min_sample_rate = 32000;
+  std::chrono::milliseconds min_time_ms = std::chrono::milliseconds(2000);
+  std::chrono::milliseconds max_noise_time_ms = std::chrono::milliseconds(2000);
+  Frequency step = 2500;
 };
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(RecordingConfig, min_sample_rate, min_time_ms, max_noise_time_ms, step)
 
@@ -41,6 +41,7 @@ struct FileConfig {
   OutputConfig output;
   PositionConfig position;
   RecordingConfig recording;
-  int workers;
+  int version = 1;
+  int workers = 0;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(FileConfig, api_key, devices, ignored_frequencies, output, position, recording, workers)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(FileConfig, api_key, devices, ignored_frequencies, output, position, recording, version, workers)

sources/file_config.h

@@ -24,7 +24,7 @@ int main(int argc, char** argv) {
   argv = app.ensure_utf8(argv);
 
   ArgConfig argConfig;
-  app.add_option("--config", argConfig.configFile, "config file")->required()->check(CLI::ExistingFile);
+  app.add_option("--config", argConfig.configFile, "config file")->required();
   app.add_option("--id", argConfig.id);
   app.add_option("--log-file", argConfig.logFileName, "log file");
   app.add_option("--log-file-count", argConfig.logFileCount, "log file count")->check(CLI::PositiveNumber);