From 96b3c7d90b1bfcdbbd87df4f560066b2ded12519 Mon Sep 17 00:00:00 2001
From: Gunnar Beutner <gunnar.beutner@icinga.com>
Date: Wed, 15 Mar 2017 15:10:58 +0100
Subject: [PATCH] Get rid of event IDs for Redis

fixes #5067
---
 lib/redis/rediswriter.cpp | 107 ++++----------------------------------
 1 file changed, 10 insertions(+), 97 deletions(-)

diff --git a/lib/redis/rediswriter.cpp b/lib/redis/rediswriter.cpp
index 7cacd04ff..f96d306bf 100644
--- a/lib/redis/rediswriter.cpp
+++ b/lib/redis/rediswriter.cpp
@@ -248,121 +248,34 @@ void RedisWriter::HandleEvent(const Dictionary::Ptr& event)
 	if (!m_Context)
 		return;
 
-	String type = event->Get("type");
-	bool atLeastOneSubscriber = false;
-
-	for (const std::pair<String, RedisSubscriptionInfo>& kv : m_Subscriptions) {
-		const auto& rsi = kv.second;
-
-		if (rsi.EventTypes.find(type) == rsi.EventTypes.end())
-			continue;
-
-		atLeastOneSubscriber = true;
-	}
-
-	if (!atLeastOneSubscriber)
-		return;
-
-	Log(LogInformation, "RedisWriter")
-	    << "Pushing event to Redis: '" << Value(event) << "'.";
-
-	redisReply *reply1 = reinterpret_cast<redisReply *>(redisCommand(m_Context, "INCR icinga:event.idx"));
-
-	if (!reply1) {
-		redisFree(m_Context);
-		m_Context = NULL;
-		return;
-	}
-
-	Log(LogInformation, "RedisWriter")
-	    << "Called INCR in HandleEvent";
-
-	if (reply1->type == REDIS_REPLY_STATUS || reply1->type == REDIS_REPLY_ERROR) {
-		Log(LogInformation, "RedisWriter")
-		    << "INCR icinga:event.idx: " << reply1->str;
-	}
-
-	if (reply1->type == REDIS_REPLY_ERROR) {
-		freeReplyObject(reply1);
-		return;
-	}
-
-	//TODO
-	VERIFY(reply1->type == REDIS_REPLY_INTEGER);
-
-	long long index = reply1->integer;
-
-	freeReplyObject(reply1);
-
-	String body = JsonEncode(event);
-
-	//TODO: Verify that %lld is supported
-	redisReply *reply2 = reinterpret_cast<redisReply *>(redisCommand(m_Context, "SET icinga:event.%d %s", (int)index, body.CStr()));
-
-	if (!reply2) {
-		redisFree(m_Context);
-		m_Context = NULL;
-		return;
-	}
-
-	if (reply2->type == REDIS_REPLY_STATUS || reply2->type == REDIS_REPLY_ERROR) {
-		Log(LogInformation, "RedisWriter")
-		    << "SET icinga:event." << index << ": " << reply2->str;
-	}
-
-	if (reply2->type == REDIS_REPLY_ERROR) {
-		freeReplyObject(reply2);
-		return;
-	}
-
-	freeReplyObject(reply2);
-
-	redisReply *reply3 = reinterpret_cast<redisReply *>(redisCommand(m_Context, "EXPIRE icinga:event.%d 3600", (int)index, body.CStr()));
-
-	if (!reply3) {
-		redisFree(m_Context);
-		m_Context = NULL;
-		return;
-	}
-
-	if (reply3->type == REDIS_REPLY_STATUS || reply3->type == REDIS_REPLY_ERROR) {
-		Log(LogInformation, "RedisWriter")
-		    << "EXPIRE icinga:event." << index << ": " << reply3->str;
-	}
-
-	if (reply3->type == REDIS_REPLY_ERROR) {
-		freeReplyObject(reply3);
-		return;
-	}
-
-	freeReplyObject(reply3);
-
 	for (const std::pair<String, RedisSubscriptionInfo>& kv : m_Subscriptions) {
 		const auto& name = kv.first;
 		const auto& rsi = kv.second;
 
-		if (rsi.EventTypes.find(type) == rsi.EventTypes.end())
+		if (rsi.EventTypes.find(event->Get("type")) == rsi.EventTypes.end())
 			continue;
 
-		redisReply *reply4 = reinterpret_cast<redisReply *>(redisCommand(m_Context, "LPUSH icinga:event:%s %d", name.CStr(), (int)index));
+		String body = JsonEncode(event);
+
+		redisReply *reply = reinterpret_cast<redisReply *>(redisCommand(m_Context, "LPUSH icinga:event:%s %s", name.CStr(), body.CStr()));
 
-		if (!reply4) {
+		if (!reply) {
 			redisFree(m_Context);
 			m_Context = NULL;
 			return;
 		}
 
-		if (reply4->type == REDIS_REPLY_STATUS || reply4->type == REDIS_REPLY_ERROR) {
+		if (reply->type == REDIS_REPLY_STATUS || reply->type == REDIS_REPLY_ERROR) {
 			Log(LogInformation, "RedisWriter")
-			    << "LPUSH icinga:event:" << kv.first << " " << index << ": " << reply4->str;
+			    << "LPUSH icinga:event:" << kv.first << " " << body << ": " << reply->str;
 		}
 
-		if (reply4->type == REDIS_REPLY_ERROR) {
-			freeReplyObject(reply4);
+		if (reply->type == REDIS_REPLY_ERROR) {
+			freeReplyObject(reply);
 			return;
 		}
 
-		freeReplyObject(reply4);
+		freeReplyObject(reply);
 	}
 }
 
-- 
2.40.0