CLEANUP: refactored some command logging codes.

Author: jhpark816

cmdlog.c

@@ -35,7 +35,8 @@
 #define CMDLOG_WRITE_SIZE   (4 * 1024)           /* 4KB */
 
 #define CMDLOG_FILE_MAXSIZE (10 * 1024 * 1024)   /* 10MB : log at most CMDLOG_INPUT_SIZE * N commands in one file */
-#define CMDLOG_FILE_MAXNUM   10                  /* number of log files */
+#define CMDLOG_FILE_MAXNUM   10                  /* # of cmdlog files */
+#define CMDLOG_DIRPATH_LENGTH  128               /* directory path's length */
 #define CMDLOG_FILENAME_LENGTH CMDLOG_DIRPATH_LENGTH + 128
 #define CMDLOG_FILENAME_FORMAT "%s/command_%d_%d_%d_%d.log"
 
@@ -282,6 +283,12 @@ int cmdlog_start(char *file_path, bool *already_started)
             *already_started = true;
             break;
         }
+        /* check the length of file_path */
+        if (file_path != NULL && strlen(file_path) > CMDLOG_DIRPATH_LENGTH) {
+            mc_logger->log(EXTENSION_LOG_WARNING, NULL,
+                           "Too long cmdlog file path.\n");
+            ret = -1; break;
+        }
         /* prepare command logging buffer */
         if (cmdlog.buffer.data == NULL) {
             if ((cmdlog.buffer.data = malloc(CMDLOG_BUFFER_SIZE)) == NULL) {

cmdlog.h

@@ -20,7 +20,6 @@
 #include "memcached/extension_loggers.h"
 
 #define COMMAND_LOGGING
-#define CMDLOG_DIRPATH_LENGTH 128 /* directory path's length */
 
 void cmdlog_init(int port, EXTENSION_LOGGER_DESCRIPTOR *logger);
 void cmdlog_final(void);

memcached.c

@@ -9943,22 +9943,16 @@ static void process_scan_command(conn *c, token_t *tokens, const size_t ntokens)
 #endif
 
 #ifdef COMMAND_LOGGING
-static void process_logging_command(conn *c, token_t *tokens, const size_t ntokens)
+static void process_cmdlog_command(conn *c, token_t *tokens, const size_t ntokens)
 {
-    char *type = tokens[COMMAND_TOKEN+1].value;
+    char *type = tokens[SUBCOMMAND_TOKEN].value;
     bool already_check = false;
 
     if (ntokens > 2 && strcmp(type, "start") == 0) {
         char *fpath = NULL;
         if (ntokens > 3) {
-            if (tokens[SUBCOMMAND_TOKEN+1].length > CMDLOG_DIRPATH_LENGTH) {
-                out_string(c, "\tcommand logging failed to start, path exceeds 128.\n");
-                cmdlog_in_use = false;
-                return;
-            }
             fpath = tokens[SUBCOMMAND_TOKEN+1].value;
         }
-
         int ret = cmdlog_start(fpath, &already_check);
         if (already_check) {
             out_string(c, "\tcommand logging already started.\n");
@@ -13258,7 +13252,7 @@ static void process_command_ascii(conn *c, char *command, int cmdlen)
 #ifdef COMMAND_LOGGING
     else if ((ntokens >= 2) && (strcmp(tokens[COMMAND_TOKEN].value, "cmdlog") == 0))
     {
-        process_logging_command(c, tokens, ntokens);
+        process_cmdlog_command(c, tokens, ntokens);
     }
 #endif
 #ifdef DETECT_LONG_QUERY