From ac9eaa90c45d8b1b70c2b008f45c9e8904e16643 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Mon, 10 Aug 2026 18:42:57 -0400 Subject: [PATCH] Dev_Ranger was slightly overzealous in his match and replace; --- src/fne/network/TrafficNetwork.cpp | 30 +++++++++++++++--------------- src/fne/network/TrafficNetwork.h | 10 +++++----- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/fne/network/TrafficNetwork.cpp b/src/fne/network/TrafficNetwork.cpp index 6f8cc1ca..5047337e 100644 --- a/src/fne/network/TrafficNetwork.cpp +++ b/src/fne/network/TrafficNetwork.cpp @@ -135,11 +135,11 @@ TrafficNetwork::TrafficNetwork(HostFNE* host, const std::string& address, uint16 m_enableMetrics(false), m_metricsLogRawData(false), m_enableInfluxDB(false), - m_serverAddress("127.0.0.1"), - m_serverPort(8086U), - m_serverToken(), - m_org("dvm"), - m_bucket("dvm"), + m_influxServerAddress("127.0.0.1"), + m_influxServerPort(8086U), + m_influxServerToken(), + m_influxOrg("dvm"), + m_influxBucket("dvm"), m_enableSQLite(false), m_sqliteDBFile("metrics.db"), m_sqliteDB(nullptr), @@ -253,13 +253,13 @@ void TrafficNetwork::setOptions(yaml::Node& conf, bool printOptions) yaml::Node influxConf = metricsConf["influx"]; m_enableInfluxDB = influxConf["enable"].as(false); - m_serverAddress = influxConf["serverAddress"].as("127.0.0.1"); - m_serverPort = influxConf["serverPort"].as(8086U); - m_serverToken = influxConf["serverToken"].as(); - m_org = influxConf["org"].as("dvm"); - m_bucket = influxConf["bucket"].as("dvm"); + m_influxServerAddress = influxConf["serverAddress"].as("127.0.0.1"); + m_influxServerPort = influxConf["serverPort"].as(8086U); + m_influxServerToken = influxConf["serverToken"].as(); + m_influxOrg = influxConf["org"].as("dvm"); + m_influxBucket = influxConf["bucket"].as("dvm"); if (m_enableInfluxDB) { - m_influxServer = influxdb::ServerInfo(m_serverAddress, m_serverPort, m_org, m_serverToken, m_bucket); + m_influxServer = influxdb::ServerInfo(m_influxServerAddress, m_influxServerPort, m_influxOrg, m_influxServerToken, m_influxBucket); } yaml::Node sqliteConf = metricsConf["sqlite"]; @@ -474,10 +474,10 @@ void TrafficNetwork::setOptions(yaml::Node& conf, bool printOptions) LogInfo(" Metrics Log Raw TSBK/CSBK/RCCH: %s", m_metricsLogRawData ? "yes" : "no"); LogInfo(" InfluxDB Reporting Enabled: %s", m_enableInfluxDB ? "yes" : "no"); if (m_enableInfluxDB) { - LogInfo(" InfluxDB Address: %s", m_serverAddress.c_str()); - LogInfo(" InfluxDB Port: %u", m_serverPort); - LogInfo(" InfluxDB Organization: %s", m_org.c_str()); - LogInfo(" InfluxDB Bucket: %s", m_bucket.c_str()); + LogInfo(" InfluxDB Address: %s", m_influxServerAddress.c_str()); + LogInfo(" InfluxDB Port: %u", m_influxServerPort); + LogInfo(" InfluxDB Organization: %s", m_influxOrg.c_str()); + LogInfo(" InfluxDB Bucket: %s", m_influxBucket.c_str()); } LogInfo(" SQLite Metrics Logging Enabled: %s", m_enableSQLite ? "yes" : "no"); if (m_enableSQLite) { diff --git a/src/fne/network/TrafficNetwork.h b/src/fne/network/TrafficNetwork.h index c91c6237..d6f67cd1 100644 --- a/src/fne/network/TrafficNetwork.h +++ b/src/fne/network/TrafficNetwork.h @@ -411,11 +411,11 @@ namespace network bool m_metricsLogRawData; bool m_enableInfluxDB; - std::string m_serverAddress; - uint16_t m_serverPort; - std::string m_serverToken; - std::string m_org; - std::string m_bucket; + std::string m_influxServerAddress; + uint16_t m_influxServerPort; + std::string m_influxServerToken; + std::string m_influxOrg; + std::string m_influxBucket; influxdb::ServerInfo m_influxServer; bool m_enableSQLite;