X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=clients%2Fmemping.cc;h=bbbdfda938b693226333f9ac993d2ade034480f5;hb=e5c576eff8da0ea47436179ba72d3accb851a292;hp=39546d4f660be95d4bf994a8c6bf731e332c802f;hpb=9763b8e9b681d1d6713b95e4d7ce6ffeafeafca5;p=awesomized%2Flibmemcached

diff --git a/clients/memping.cc b/clients/memping.cc
index 39546d4f..bbbdfda9 100644
--- a/clients/memping.cc
+++ b/clients/memping.cc
@@ -49,7 +49,8 @@ int main(int argc, char *argv[])
     {
       opt_servers= strdup(temp);
     }
-    else
+    
+    if (opt_servers == NULL)
     {
       std::cerr << "No Servers provided" << std::endl;
       exit(EXIT_FAILURE);
@@ -58,6 +59,12 @@ int main(int argc, char *argv[])
 
   int exit_code= EXIT_SUCCESS;
   memcached_server_st *servers= memcached_servers_parse(opt_servers);
+  if (servers == NULL or memcached_server_list_count(servers) == 0)
+  {
+    std::cerr << "Invalid server list provided:" << opt_servers << std::endl;
+    exit_code= EXIT_FAILURE;
+  }
+  else
   {
     for (uint32_t x= 0; x < memcached_server_list_count(servers); x++)
     {
@@ -65,6 +72,11 @@ int main(int argc, char *argv[])
       const char *hostname= servers[x].hostname;
       in_port_t port= servers[x].port;
 
+      if (opt_verbose)
+      {
+        std::cout << "Trying to ping " << hostname << ":" << port << std::endl;
+      }
+
       if (libmemcached_util_ping2(hostname, port, opt_username, opt_passwd, &instance_rc) == false)
       {
         std::cerr << "Failed to ping " << hostname << ":" << port << " " << memcached_strerror(NULL, instance_rc) <<  std::endl;