pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 19:03:14 +02:00
Code Activity

redis: check for socket errors when loading database on startup

Browse Source
This commit is contained in:
Adam
2017-03-16 20:13:56 -04:00
parent b2d028533d
commit 516ab164f6
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/modules/redis.h
+2
View File
@@ -58,6 +58,8 @@ namespace Redis
public:
Provider(Module *c, const Anope::string &n) : Service(c, "Redis::Provider", n) { }
virtual bool IsSocketDead() = 0;
virtual void SendCommand(Interface *i, const std::vector<Anope::string> &cmds) = 0;
virtual void SendCommand(Interface *i, const Anope::string &str) = 0;
modules/database/db_redis.cpp
+13 -1
View File
@@ -179,6 +179,12 @@ class DatabaseRedis : public Module, public Pipe
EventReturn OnLoadDatabase() anope_override
{
if (!redis)
{
Log(this) << "Unable to load database - unable to find redis provider";
return EVENT_CONTINUE;
}
const std::vector<Anope::string> type_order = Serialize::Type::GetTypeOrder();
for (unsigned i = 0; i < type_order.size(); ++i)
{
@@ -186,7 +192,13 @@ class DatabaseRedis : public Module, public Pipe
this->OnSerializeTypeCreate(sb);
}
while (redis->BlockAndProcess());
while (!redis->IsSocketDead() && redis->BlockAndProcess());
if (redis->IsSocketDead())
{
Log(this) << "I/O error while loading redis database - is it online?";
return EVENT_CONTINUE;
}
redis->Subscribe(&this->sl, "__keyspace@*__:hash:*");
modules/m_redis.cpp
+9 -2
View File
@@ -157,6 +157,11 @@ class MyRedisService : public Provider
}
public:
bool IsSocketDead() anope_override
{
return this->sock && this->sock->flags[SF_DEAD];
}
void SendCommand(RedisSocket *s, Interface *i, const std::vector<Anope::string> &cmds)
{
std::vector<std::pair<const char *, size_t> > args;
@@ -201,9 +206,11 @@ class MyRedisService : public Provider
public:
bool BlockAndProcess() anope_override
{
this->sock->ProcessWrite();
if (!this->sock->ProcessWrite())
this->sock->flags[SF_DEAD] = true;
this->sock->SetBlocking(true);
this->sock->ProcessRead();
if (!this->sock->ProcessRead())
this->sock->flags[SF_DEAD] = true;
this->sock->SetBlocking(false);
return !this->sock->interfaces.empty();
}