From b55c1602b564d67ccd61a16f70eeefbe39600fba Mon Sep 17 00:00:00 2001
From: Kevin McGehee <mcgehee@amazon.com>
Date: Wed, 29 Jul 2020 17:54:37 -0700
Subject: [PATCH] Call propagate instead of writing directly to AOF/replicas
 (#6658)

Use higher-level API to funnel all generic propagation through
single function call.
---
 src/db.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/db.c b/src/db.c
index 19b2c48e4..529b57c7b 100644
--- a/src/db.c
+++ b/src/db.c
@@ -1228,9 +1228,7 @@ void propagateExpire(redisDb *db, robj *key, int lazy) {
     incrRefCount(argv[0]);
     incrRefCount(argv[1]);
 
-    if (server.aof_state != AOF_OFF)
-        feedAppendOnlyFile(server.delCommand,db->id,argv,2);
-    replicationFeedSlaves(server.slaves,db->id,argv,2);
+    propagate(server.delCommand,db->id,argv,2,PROPAGATE_AOF|PROPAGATE_REPL);
 
     decrRefCount(argv[0]);
     decrRefCount(argv[1]);