AOF fixes in the context of replicaiton (when AOF is used by slave) and CONFIG SET...

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index 431eeb1404b16487a35631ac54381c333ed2b1ec..79a28911d0de9f5b982a8f63574cf5e9fc4c824f 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -54,6 +54,7 @@
 #define REDIS_MAX_LOGMSG_LEN    1024 /* Default maximum length of syslog messages */
 #define REDIS_AUTO_AOFREWRITE_PERC  100
 #define REDIS_AUTO_AOFREWRITE_MIN_SIZE (1024*1024)
+#define REDIS_AOFREWRITE_ITEMS_PER_CMD 64
 #define REDIS_SLOWLOG_LOG_SLOWER_THAN 10000
 #define REDIS_SLOWLOG_MAX_LEN 64
 #define REDIS_MAX_CLIENTS 10000
@@ -546,6 +547,7 @@ struct redisServer {
     off_t auto_aofrewrite_base_size;/* AOF size on latest startup or rewrite. */
     off_t appendonly_current_size;  /* AOF current size. */
     int aofrewrite_scheduled;       /* Rewrite once BGSAVE terminates. */
+    int aof_wait_rewrite;           /* Don't append to AOF before rewrite */
     int shutdown_asap;              /* SHUTDOWN needed */
     int activerehashing;
     char *requirepass;
@@ -954,7 +956,7 @@ int listMatchPubsubPattern(void *a, void *b);
 int pubsubPublishMessage(robj *channel, robj *message);
 
 /* Configuration */
-void loadServerConfig(char *filename);
+void loadServerConfig(char *filename, char *options);
 void appendServerSaveParams(time_t seconds, int changes);
 void resetServerSaveParams();