caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Lua debugger: support direct calls to SCRIPT DEBUG in redis-cli.

Browse Source 
Previously it was possible to activate a debugging session only using
the --ldb option in redis-cli. Now calling SCRIPT DEBUG can also
activate the debugging mode without putting the redis-cli in a
desynchronized state.

Related to #2952.
This commit is contained in:
antirez 2016-01-08 09:42:56 +01:00
parent a75aa4bf92
commit 7c1a5ff3ce
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/redis-cli.c
View File

@ -114,6 +114,7 @@ static struct config {
int eval_ldb; int eval_ldb;
int eval_ldb_sync; /* Ask for synchronous mode of the Lua debugger. */ int eval_ldb_sync; /* Ask for synchronous mode of the Lua debugger. */
int eval_ldb_end; /* Lua debugging session ended. */ int eval_ldb_end; /* Lua debugging session ended. */
int enable_ldb_on_eval; /* Handle manual SCRIPT DEBUG + EVAL commands. */
int last_cmd_type; int last_cmd_type;
} config; } config;
@ -551,6 +552,7 @@ static sds cliFormatReplyRaw(redisReply *r) {
/* Detect the end of a debugging session. */ /* Detect the end of a debugging session. */
if (strstr(r->str,"<endsession>") == r->str) { if (strstr(r->str,"<endsession>") == r->str) {
config.enable_ldb_on_eval = 0;
config.eval_ldb = 0; config.eval_ldb = 0;
config.eval_ldb_end = 1; /* Signal the caller session ended. */ config.eval_ldb_end = 1; /* Signal the caller session ended. */
config.output = OUTPUT_STANDARD; config.output = OUTPUT_STANDARD;
@ -734,6 +736,24 @@ static int cliSendCommand(int argc, char **argv, int repeat) {
if (!strcasecmp(command,"sync") || if (!strcasecmp(command,"sync") ||
!strcasecmp(command,"psync")) config.slave_mode = 1; !strcasecmp(command,"psync")) config.slave_mode = 1;
/* When the user manually calls SCRIPT DEBUG, setup the activation of
* debugging mode on the next eval if needed. */
if (argc == 3 && !strcasecmp(argv[0],"script") &&
!strcasecmp(argv[1],"debug"))
{
if (!strcasecmp(argv[2],"yes") || !strcasecmp(argv[2],"sync")) {
config.enable_ldb_on_eval = 1;
} else {
config.enable_ldb_on_eval = 0;
}
}
/* Actually activate LDB on EVAL if needed. */
if (!strcasecmp(command,"eval") && config.enable_ldb_on_eval) {
config.eval_ldb = 1;
config.output = OUTPUT_RAW;
}
/* Setup argument length */ /* Setup argument length */
argvlen = malloc(argc*sizeof(size_t)); argvlen = malloc(argc*sizeof(size_t));
for (j = 0; j < argc; j++) for (j = 0; j < argc; j++)
@ -2383,6 +2403,7 @@ int main(int argc, char **argv) {
config.eval_ldb = 0; config.eval_ldb = 0;
config.eval_ldb_end = 0; config.eval_ldb_end = 0;
config.eval_ldb_sync = 0; config.eval_ldb_sync = 0;
config.enable_ldb_on_eval = 0;
config.last_cmd_type = -1; config.last_cmd_type = -1;
spectrum_palette = spectrum_palette_color; spectrum_palette = spectrum_palette_color;