Skip to content

Commit

Permalink
Let INFO redis_mode/server_mode depend on extended-redis-compatibility
Browse files Browse the repository at this point in the history
Signed-off-by: Viktor Söderqvist <[email protected]>
  • Loading branch information
zuiderkwast committed Apr 11, 2024
1 parent cc4ed3d commit 262b997
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/server.c
Original file line number Diff line number Diff line change
Expand Up @@ -5608,7 +5608,8 @@ sds genRedisInfoString(dict *section_dict, int all_sections, int everything) {
"redis_git_sha1:%s\r\n", serverGitSHA1(),
"redis_git_dirty:%i\r\n", strtol(serverGitDirty(),NULL,10) > 0,
"redis_build_id:%s\r\n", serverBuildIdString(),
"redis_mode:%s\r\n", mode,
"%s_mode:", (server.extended_redis_compat ? "redis" : "server"),
"%s\r\n", mode,
"os:%s", name.sysname,
" %s", name.release,
" %s\r\n", name.machine,
Expand Down
6 changes: 6 additions & 0 deletions tests/unit/other.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -377,10 +377,16 @@ start_server {tags {"other"}} {
set hello [r hello 3]
assert_equal "redis" [dict get $hello server]
assert_match "7.2.*" [dict get $hello version]
set info [r info server]
assert_match "*redis_mode:*" $info
assert_no_match "*server_mode:*" $info
r config set extended-redis-compatibility no
set hello [r hello 3]
assert_equal "valkey" [dict get $hello server]
assert_equal $version [dict get $hello version]
set info [r info server]
assert_no_match "*redis_mode:*" $info
assert_match "*server_mode:*" $info
}
}
}
Expand Down

0 comments on commit 262b997

Please sign in to comment.