A reimplementation of blocking operation internals.

[redis.git] / src / aof.c

diff --git a/src/aof.c b/src/aof.c
index 7c9bbdcb5e4ddbccd3e162556f6dd9eaf79f19e6..441ccaf18802ef9139efd2c38169a3c39a57799d 100644 (file)
--- a/src/aof.c
+++ b/src/aof.c
@@ -1100,6 +1100,8 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
             server.aof_buf = sdsempty();
         }
 
             server.aof_buf = sdsempty();
         }
 

+        server.aof_lastbgrewrite_status = REDIS_OK;
+

         redisLog(REDIS_NOTICE, "Background AOF rewrite finished successfully");
         /* Change state from WAIT_REWRITE to ON if needed */
         if (server.aof_state == REDIS_AOF_WAIT_REWRITE)
         redisLog(REDIS_NOTICE, "Background AOF rewrite finished successfully");
         /* Change state from WAIT_REWRITE to ON if needed */
         if (server.aof_state == REDIS_AOF_WAIT_REWRITE)


@@ -1111,9 +1113,13 @@ void backgroundRewriteDoneHandler(int exitcode, int bysignal) {
         redisLog(REDIS_VERBOSE,
             "Background AOF rewrite signal handler took %lldus", ustime()-now);
     } else if (!bysignal && exitcode != 0) {
         redisLog(REDIS_VERBOSE,
             "Background AOF rewrite signal handler took %lldus", ustime()-now);
     } else if (!bysignal && exitcode != 0) {

+        server.aof_lastbgrewrite_status = REDIS_ERR;
+

         redisLog(REDIS_WARNING,
             "Background AOF rewrite terminated with error");
     } else {
         redisLog(REDIS_WARNING,
             "Background AOF rewrite terminated with error");
     } else {

+        server.aof_lastbgrewrite_status = REDIS_ERR;
+

         redisLog(REDIS_WARNING,
             "Background AOF rewrite terminated by signal %d", bysignal);
     }
         redisLog(REDIS_WARNING,
             "Background AOF rewrite terminated by signal %d", bysignal);
     }