set default value to client; change send buf to local vars;

talebook · talebook · commit 12a5531b1472 · 2014-03-07T11:07:51.000+08:00
diff --git a/Makefile b/Makefile
@@ -7,4 +7,5 @@ all:
 clean:
 	make -C src/ clean;
 	make -C demo/ clean;
+	@rm -f ./system_monitor ./test_client
 
diff --git a/src/statsd_client.cpp b/src/statsd_client.cpp
@@ -32,26 +32,21 @@ inline bool should_send(float sample_rate)
 
 
 struct _StatsdClientData {
-    int sock;
-    struct sockaddr_in server;
+    int     sock;
+    struct  sockaddr_in server;
 
-    std::string ns;
-    std::string host;
-    short       port;
-    bool        init;
+    string  ns;
+    string  host;
+    short   port;
+    bool    init;
 
-    char buf[255];
-    char errmsg[1024];
+    char    errmsg[1024];
 };
 
 StatsdClient::StatsdClient(const string& host, int port, const string& ns)
 {
     d = new _StatsdClientData;
-    d->ns = ns;
-    d->host = host;
-    d->port = port;
-    d->init = false;
-    d->sock = -1;
+    config(host, port, ns);
     srandom(time(NULL));
 }
 
@@ -64,6 +59,18 @@ StatsdClient::~StatsdClient()
     }
 }
 
+void StatsdClient::config(const string& host, int port, const string& ns)
+{
+    d->ns = ns;
+    d->host = host;
+    d->port = port;
+    d->init = false;
+    if ( d->sock >= 0 ) {
+        close(d->sock);
+    }
+    d->sock = -1;
+}
+
 int StatsdClient::init()
 {
     if ( d->init ) return 0;
@@ -146,18 +153,19 @@ int StatsdClient::send(string key, size_t value, const string &type, float sampl
 
     cleanup(key);
 
+    char buf[256];
     if ( fequal( sample_rate, 1.0 ) )
     {
-        snprintf(d->buf, sizeof(d->buf), "%s%s:%zd|%s",
+        snprintf(buf, sizeof(buf), "%s%s:%zd|%s",
                 d->ns.c_str(), key.c_str(), value, type.c_str());
     }
     else
     {
-        snprintf(d->buf, sizeof(d->buf), "%s%s:%zd|%s|@%.2f",
+        snprintf(buf, sizeof(buf), "%s%s:%zd|%s|@%.2f",
                 d->ns.c_str(), key.c_str(), value, type.c_str(), sample_rate);
     }
 
-    return send(d->buf);
+    return send(buf);
 }
 
 int StatsdClient::send(const string &message)
diff --git a/src/statsd_client.h b/src/statsd_client.h
@@ -13,11 +13,15 @@ struct _StatsdClientData;
 
 class StatsdClient {
     public:
-        StatsdClient(const std::string& host, int port, const std::string& ns = "");
+        StatsdClient(const std::string& host="127.0.0.1", int port=8125, const std::string& ns = "");
         ~StatsdClient();
 
     public:
+        // you can config at anytime; client will use new address (useful for Singleton)
+        void config(const std::string& host, int port, const std::string& ns = "");
         const char* errmsg();
+
+    public:
         int inc(const std::string& key, float sample_rate = 1.0);
         int dec(const std::string& key, float sample_rate = 1.0);
         int count(const std::string& key, size_t count, float sample_rate = 1.0);
