From f7f321663af34f2e81331a2582c81a8d4fab056d Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 2 Jul 2013 14:42:31 -0700 Subject: [PATCH] DRY up multiple stat type sending --- audio-mixer/src/main.cpp | 2 +- domain-server/src/main.cpp | 2 +- interface/src/Application.cpp | 2 +- libraries/shared/src/Logstash.cpp | 18 +----------------- libraries/shared/src/Logstash.h | 10 +++++----- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 5782539180..c14df9ca43 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -138,7 +138,7 @@ int main(int argc, const char* argv[]) { const char MIXER_LOGSTASH_METRIC_NAME[] = "audio-mixer-frame-time-usage"; float averageFrameTimePercentage = sumFrameTimePercentages / numStatCollections; - Logstash::stashGaugeValue(MIXER_LOGSTASH_METRIC_NAME, averageFrameTimePercentage); + Logstash::stashValue(STAT_TYPE_GAUGE, MIXER_LOGSTASH_METRIC_NAME, averageFrameTimePercentage); sumFrameTimePercentages = 0.0f; numStatCollections = 0; diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 8bbdfe0f6b..5139e13dd8 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -181,7 +181,7 @@ int main(int argc, const char * argv[]) // time to send our count of agents and servers to logstash const char NODE_COUNT_LOGSTASH_KEY[] = "ds-node-count"; - Logstash::stashGaugeValue(NODE_COUNT_LOGSTASH_KEY, agentList->getNumAliveAgents()); + Logstash::stashValue(STAT_TYPE_GAUGE, NODE_COUNT_LOGSTASH_KEY, agentList->getNumAliveAgents()); gettimeofday(&lastStatSendTime, NULL); } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 7d546328aa..bf56943974 100755 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -349,7 +349,7 @@ void Application::initializeGL() { const char LOGSTASH_INTERFACE_START_TIME_KEY[] = "interface-start-time"; // ask the Logstash class to record the startup time - Logstash::stashTimerValue(LOGSTASH_INTERFACE_START_TIME_KEY, startupTime); + Logstash::stashValue(STAT_TYPE_TIMER, LOGSTASH_INTERFACE_START_TIME_KEY, startupTime); } // update before the first render diff --git a/libraries/shared/src/Logstash.cpp b/libraries/shared/src/Logstash.cpp index bee5e26aba..7773fa76c2 100644 --- a/libraries/shared/src/Logstash.cpp +++ b/libraries/shared/src/Logstash.cpp @@ -57,20 +57,4 @@ void Logstash::stashValue(char valueType, const char* key, float value) { if (agentList) { agentList->getAgentSocket()->send(socket(), logstashPacket, numPacketBytes); } -} - -void Logstash::stashTimerValue(const char* key, float value) { - const char STAT_TYPE_TIMER = 't'; - stashValue(STAT_TYPE_TIMER, key, value); -} - -void Logstash::stashCounterValue(const char* key, float value) { - const char STAT_TYPE_COUNTER = 'c'; - stashValue(STAT_TYPE_COUNTER, key, value); -} - -void Logstash::stashGaugeValue(const char* key, float value) { - const char STAT_TYPE_GAUGE = 'g'; - stashValue(STAT_TYPE_GAUGE, key, value); -} - +} \ No newline at end of file diff --git a/libraries/shared/src/Logstash.h b/libraries/shared/src/Logstash.h index f41a42e85f..7c805ddb23 100644 --- a/libraries/shared/src/Logstash.h +++ b/libraries/shared/src/Logstash.h @@ -14,16 +14,16 @@ const int LOGSTASH_UDP_PORT = 9500; const char LOGSTASH_HOSTNAME[] = "graphite.highfidelity.io"; +const char STAT_TYPE_TIMER = 't'; +const char STAT_TYPE_COUNTER = 'c'; +const char STAT_TYPE_GAUGE = 'g'; + class Logstash { public: static sockaddr* socket(); static bool shouldSendStats(); - static void stashTimerValue(const char* key, float value); - static void stashCounterValue(const char* key, float value); - static void stashGaugeValue(const char* key, float value); + static void stashValue(char statType, const char* key, float value); private: - static void stashValue(char valueType, const char* key, float value); - static sockaddr_in logstashSocket; };