redis-trib: minor refactoring creating a method to load the cluster information start...

[redis.git] / src / config.c

diff --git a/src/config.c b/src/config.c
index 5442e0366cc2bc9ab365cbdbb64a400227ad3e25..d470dab1a1d80614be08ab53557a26c1c7b91eb8 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -508,12 +508,11 @@ void configGetCommand(redisClient *c) {
     if (stringmatch(pattern,"dir",0)) {
         char buf[1024];
 
     if (stringmatch(pattern,"dir",0)) {
         char buf[1024];
 

-        addReplyBulkCString(c,"dir");
-        if (getcwd(buf,sizeof(buf)) == NULL) {
+        if (getcwd(buf,sizeof(buf)) == NULL)

             buf[0] = '\0';
             buf[0] = '\0';

-        } else {
-            addReplyBulkCString(c,buf);
-        }
+
+        addReplyBulkCString(c,"dir");
+        addReplyBulkCString(c,buf);

         matches++;
     }
     if (stringmatch(pattern,"dbfilename",0)) {
         matches++;
     }
     if (stringmatch(pattern,"dbfilename",0)) {


@@ -657,6 +656,8 @@ void configGetCommand(redisClient *c) {
     if (stringmatch(pattern,"lua-time-limit",0)) {
         addReplyBulkCString(c,"lua-time-limit");
         addReplyBulkLongLong(c,server.lua_time_limit);
     if (stringmatch(pattern,"lua-time-limit",0)) {
         addReplyBulkCString(c,"lua-time-limit");
         addReplyBulkLongLong(c,server.lua_time_limit);

+        matches++;
+    }

     if (stringmatch(pattern,"slowlog-log-slower-than",0)) {
         addReplyBulkCString(c,"slowlog-log-slower-than");
         addReplyBulkLongLong(c,server.slowlog_log_slower_than);
     if (stringmatch(pattern,"slowlog-log-slower-than",0)) {
         addReplyBulkCString(c,"slowlog-log-slower-than");
         addReplyBulkLongLong(c,server.slowlog_log_slower_than);