diff options
author | antirez <antirez@gmail.com> | 2012-07-28 20:55:17 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2012-07-28 20:55:17 +0200 |
commit | 7f5bdba4343cf32c8ae7d38a3f6d0d163677c14c (patch) | |
tree | 2716bccb2bbb3d11501ce9f19fa8b65c58ed11d0 /src/redis.c | |
parent | 3f194a9d2571df21717b635f037040407a51d50d (diff) | |
parent | f3a61431999ce99b1823de8ba7d8566a22d7566e (diff) | |
download | redis-7f5bdba4343cf32c8ae7d38a3f6d0d163677c14c.tar.gz |
Merge remote-tracking branch 'origin/unstable' into unstable
Diffstat (limited to 'src/redis.c')
-rw-r--r-- | src/redis.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/redis.c b/src/redis.c index e636aa9b5..f2c5e2c70 100644 --- a/src/redis.c +++ b/src/redis.c @@ -1121,6 +1121,7 @@ void initServerConfig() { server.aof_last_fsync = time(NULL); server.aof_rewrite_time_last = -1; server.aof_rewrite_time_start = -1; + server.aof_lastbgrewrite_status = REDIS_OK; server.aof_delayed_fsync = 0; server.aof_fd = -1; server.aof_selected_db = -1; /* Make sure the first time will not match */ @@ -1967,12 +1968,13 @@ sds genRedisInfoString(char *section) { "aof_rewrite_in_progress:%d\r\n" "aof_rewrite_scheduled:%d\r\n" "aof_last_rewrite_time_sec:%ld\r\n" - "aof_current_rewrite_time_sec:%ld\r\n", + "aof_current_rewrite_time_sec:%ld\r\n" + "aof_last_bgrewrite_status:%s\r\n", server.loading, server.dirty, server.rdb_child_pid != -1, server.lastsave, - server.lastbgsave_status == REDIS_OK ? "ok" : "err", + (server.lastbgsave_status == REDIS_OK) ? "ok" : "err", server.rdb_save_time_last, (server.rdb_child_pid == -1) ? -1 : time(NULL)-server.rdb_save_time_start, @@ -1981,7 +1983,8 @@ sds genRedisInfoString(char *section) { server.aof_rewrite_scheduled, server.aof_rewrite_time_last, (server.aof_child_pid == -1) ? - -1 : time(NULL)-server.aof_rewrite_time_start); + -1 : time(NULL)-server.aof_rewrite_time_start, + (server.aof_lastbgrewrite_status == REDIS_OK) ? "ok" : "err"); if (server.aof_state != REDIS_AOF_OFF) { info = sdscatprintf(info, |