tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-23 21:55:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implement RedisWriter::ExecuteQuery

Browse Source 
refs #4991
This commit is contained in:
Gunnar Beutner 2017-03-21 13:52:55 +01:00 committed by Michael Friedrich
parent f29a82bcfe
commit 75bfd775b9
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/redis/rediswriter.cpp
View File

@ -331,3 +331,36 @@ void RedisWriter::AssertOnWorkQueue(void)
{ {
ASSERT(m_WorkQueue.IsWorkerThread()); ASSERT(m_WorkQueue.IsWorkerThread());
} }
boost::shared_ptr<redisReply> RedisWriter::ExecuteQuery(const std::vector<String>& query)
{
const char **argv;
size_t *argvlen;
argv = new const char *[query.size()];
argvlen = new size_t[query.size()];
for (std::vector<String>::size_type i = 0; i < query.size(); i++) {
argv[i] = query[i].CStr();
argvlen[i] = query[i].GetLength();
}
redisReply *reply = reinterpret_cast<redisReply *>(redisCommandArgv(m_Context, query.size(), argv, argvlen));
if (reply->type == REDIS_REPLY_ERROR) {
Log(LogInformation, "RedisWriter")
<< "Redis query failed: " << reply->str;
String msg = reply->str;
freeReplyObject(reply);
BOOST_THROW_EXCEPTION(
redis_error()
<< errinfo_message(msg)
<< errinfo_redis_query(Utility::Join(Array::FromVector(query), ' ', false))
);
}
return boost::shared_ptr<redisReply>(reply);
}

7
lib/redis/rediswriter.hpp
View File

@ -81,6 +81,8 @@ private:
void AssertOnWorkQueue(void); void AssertOnWorkQueue(void);
boost::shared_ptr<redisReply> ExecuteQuery(const std::vector<String>& query);
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;
Timer::Ptr m_SubscriptionTimer; Timer::Ptr m_SubscriptionTimer;
WorkQueue m_WorkQueue; WorkQueue m_WorkQueue;
@ -88,6 +90,11 @@ private:
std::map<String, RedisSubscriptionInfo> m_Subscriptions; std::map<String, RedisSubscriptionInfo> m_Subscriptions;
}; };
struct redis_error : virtual std::exception, virtual boost::exception { };
struct errinfo_redis_query_;
typedef boost::error_info<struct errinfo_redis_query_, std::string> errinfo_redis_query;
} }
#endif /* REDISWRITER_H */ #endif /* REDISWRITER_H */