We're able to load the config file, now.

twproxy.cpp

@@ -46,26 +46,29 @@ void init_logging(void) {
 
   // "proxy-%Y-%m-%d.log"
   std::string log_filename = "proxy.log";
-  if (CONFIG["log_file"]) log_filename = CONFIG["log_file"];
+  if (CONFIG.contains("log_file")) log_filename = CONFIG["log_file"];
 
   //  = from_config("log_file", "proxy.log");
   // "%I:%M:%S.%f %p"
   std::string log_timeformat = "%H:%M:%S.%f";
-  if (CONFIG["log_timeformat"])
+  if (CONFIG.contains("log_timeformat"))
     log_timeformat = CONFIG["log_timeformat"];
   // from_config("log_timeformat", "%H:%M:%S.%f");
   bool log_autoflush = false;
+  /*
   if (CONFIG["log_autoflush"]) {
-    log_autoflush = (int)CONFIG["log_autoflush"] == 1;
+    log_autoflush = CONFIG["log_autoflush"];
   }
+  */
   int log_level = 2;
-  if (CONFIG["log_level"]) {
+  if (CONFIG.contains("log_level")) {
     log_level = (int)CONFIG["log_level"];
   }
 
   bool console = false;
-  if (CONFIG["log_console"]) {
-    console = (int)CONFIG["log_console"] == 1;
+
+  if (CONFIG.contains("log_console")) {
+    console = CONFIG["log_console"];
   }
 
   std::cout << "Logging to: ";
@@ -109,7 +112,7 @@ int main(int argc, char *argv[]) {
 
   {
     std::ifstream fin(argv[1]);
-    CONFIG = json::parse(fin); // YAML::LoadFile(argv[1]);
+    CONFIG = json::parse(fin);  // YAML::LoadFile(argv[1]);
   }
 
   init_logging();
@@ -118,7 +121,7 @@ int main(int argc, char *argv[]) {
 
   // for (const char *key : {"server", "host", "port"}) {
   for (auto key : {"server", "host", "port", "basename"}) {
-    if (!CONFIG[key]) {
+    if (!CONFIG.contains(key)) {
       config_ok = false;
       std::cout << "Config file missing: " << key << std::endl;
       BUGZ_LOG(fatal) << "Config file missing: " << key;
@@ -127,19 +130,26 @@ int main(int argc, char *argv[]) {
     // The leaks are reported here, because this is the first usage of the
     // BOOST_LOG_TRIVIAL()! Comment these out, and the leaks are reported at the
     // next logging usage instance.
-    std::string value = CONFIG[key];
-    BUGZ_LOG(info) << "Config: " << key << " : " << value;
+    if (CONFIG[key].is_string()) {
+      std::string value = CONFIG[key].get<std::string>();
+      BUGZ_LOG(info) << "Config: " << key << " : " << value;
+    } else if (CONFIG[key].is_number_integer()) {
+      int value = CONFIG[key].get<int>();
+      BUGZ_LOG(info) << "Config: " << key << " : " << value;
+    } else {
+      BUGZ_LOG(info) << "Config: " << key << " : ??";
+    }
   }
 
   if (!config_ok) return EXIT_FAILURE;
 
-  int port = CONFIG["server"];
+  int port = CONFIG["server"].get<int>();
   // int port = 9999; // 2002;
 
   try {
     bool telnet = false;
 
-    if (CONFIG["server_telnet"]) {
+    if (CONFIG.contains("server_telnet")) {
       telnet = true;
       BUGZ_LOG(fatal) << "Connect to server via TELNET";
     }
@@ -149,11 +159,12 @@ int main(int argc, char *argv[]) {
     boost::asio::ip::tcp::endpoint endpoint(boost::asio::ip::tcp::v4(),
                                             port);  // std::atoi(argv[i]));
     // connect to the game server
-    std::string host = CONFIG["host"];
-    std::string port = CONFIG["port"];
+    std::string host = CONFIG["host"].get<std::string>();
+    int port = CONFIG["port"].get<int>();
+    std::string port_text = std::to_string(port);
     BUGZ_LOG(fatal) << "host: " << host << " port: " << port;
 
-    Server serve(io_service, endpoint, host, port, telnet);
+    Server serve(io_service, endpoint, host, port_text, telnet);
 
     io_service.run();
   } catch (std::exception &e) {