Add function to get server info.

[dragonfireclient.git] / src / database-redis.cpp

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index cc4e5badea7dd0a075b2cc270a748a6838400c9f..93e6717fa7e5ee4f67dca84bb7e7663936d8307e 100644 (file)
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -44,13 +44,26 @@ Database_Redis::Database_Redis(Settings &conf)
        }
        const char *addr = tmp.c_str();
        int port = conf.exists("redis_port") ? conf.getU16("redis_port") : 6379;
-       ctx = redisConnect(addr, port);
+       // if redis_address contains '/' assume unix socket, else hostname/ip
+       ctx = tmp.find('/') != std::string::npos ? redisConnectUnix(addr) : redisConnect(addr, port);
        if (!ctx) {
-               throw FileNotGoodException("Cannot allocate redis context");
+               throw DatabaseException("Cannot allocate redis context");
        } else if (ctx->err) {
                std::string err = std::string("Connection error: ") + ctx->errstr;
                redisFree(ctx);
-               throw FileNotGoodException(err);
+               throw DatabaseException(err);
+       }
+       if (conf.exists("redis_password")) {
+               tmp = conf.get("redis_password");
+               redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "AUTH %s", tmp.c_str()));
+               if (!reply)
+                       throw DatabaseException("Redis authentication failed");
+               if (reply->type == REDIS_REPLY_ERROR) {
+                       std::string err = "Redis authentication failed: " + std::string(reply->str, reply->len);
+                       freeReplyObject(reply);
+                       throw DatabaseException(err);
+               }
+               freeReplyObject(reply);
        }
 }
 
@@ -62,7 +75,7 @@ Database_Redis::~Database_Redis()
 void Database_Redis::beginSave() {
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "MULTI"));
        if (!reply) {
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'MULTI' failed: ") + ctx->errstr);
        }
        freeReplyObject(reply);
@@ -71,7 +84,7 @@ void Database_Redis::beginSave() {
 void Database_Redis::endSave() {
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "EXEC"));
        if (!reply) {
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'EXEC' failed: ") + ctx->errstr);
        }
        freeReplyObject(reply);
@@ -84,15 +97,15 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HSET %s %s %b",
                        hash.c_str(), tmp.c_str(), data.c_str(), data.size()));
        if (!reply) {
-               errorstream << "WARNING: saveBlock: redis command 'HSET' failed on "
+               warningstream << "saveBlock: redis command 'HSET' failed on "
                        "block " << PP(pos) << ": " << ctx->errstr << std::endl;
                freeReplyObject(reply);
                return false;
        }
 
        if (reply->type == REDIS_REPLY_ERROR) {
-               errorstream << "WARNING: saveBlock: saving block " << PP(pos)
-                       << " failed: " << reply->str << std::endl;
+               warningstream << "saveBlock: saving block " << PP(pos)
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -101,29 +114,46 @@ bool Database_Redis::saveBlock(const v3s16 &pos, const std::string &data)
        return true;
 }
 
-std::string Database_Redis::loadBlock(const v3s16 &pos)
+void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
 {
        std::string tmp = i64tos(getBlockAsInteger(pos));
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
                        "HGET %s %s", hash.c_str(), tmp.c_str()));
 
        if (!reply) {
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'HGET %s %s' failed: ") + ctx->errstr);
        }
+
        switch (reply->type) {
        case REDIS_REPLY_STRING: {
-               std::string str(reply->str, reply->len);
+               *block = std::string(reply->str, reply->len);
                // std::string copies the memory so this won't cause any problems
                freeReplyObject(reply);
-               return str;
+               return;
        }
-       case REDIS_REPLY_ERROR:
-               errorstream << "WARNING: loadBlock: loading block " << PP(pos)
-                       << " failed: " << reply->str << std::endl;
+       case REDIS_REPLY_ERROR: {
+               std::string errstr(reply->str, reply->len);
+               freeReplyObject(reply);
+               errorstream << "loadBlock: loading block " << PP(pos)
+                       << " failed: " << errstr << std::endl;
+               throw DatabaseException(std::string(
+                       "Redis command 'HGET %s %s' errored: ") + errstr);
+       }
+       case REDIS_REPLY_NIL: {
+               *block = "";
+               // block not found in database
+               freeReplyObject(reply);
+               return;
        }
+       }
+
+       errorstream << "loadBlock: loading block " << PP(pos)
+               << " returned invalid reply type " << reply->type
+               << ": " << std::string(reply->str, reply->len) << std::endl;
        freeReplyObject(reply);
-       return "";
+       throw DatabaseException(std::string(
+               "Redis command 'HGET %s %s' gave invalid reply."));
 }
 
 bool Database_Redis::deleteBlock(const v3s16 &pos)
@@ -133,11 +163,11 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx,
                "HDEL %s %s", hash.c_str(), tmp.c_str()));
        if (!reply) {
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
        } else if (reply->type == REDIS_REPLY_ERROR) {
-               errorstream << "WARNING: deleteBlock: deleting block " << PP(pos)
-                       << " failed: " << reply->str << std::endl;
+               warningstream << "deleteBlock: deleting block " << PP(pos)
+                       << " failed: " << std::string(reply->str, reply->len) << std::endl;
                freeReplyObject(reply);
                return false;
        }
@@ -150,18 +180,21 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
 {
        redisReply *reply = static_cast<redisReply *>(redisCommand(ctx, "HKEYS %s", hash.c_str()));
        if (!reply) {
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'HKEYS %s' failed: ") + ctx->errstr);
        }
        switch (reply->type) {
        case REDIS_REPLY_ARRAY:
+               dst.reserve(reply->elements);
                for (size_t i = 0; i < reply->elements; i++) {
                        assert(reply->element[i]->type == REDIS_REPLY_STRING);
                        dst.push_back(getIntegerAsBlock(stoi64(reply->element[i]->str)));
                }
+               break;
        case REDIS_REPLY_ERROR:
-               throw FileNotGoodException(std::string(
-                       "Failed to get keys from database: ") + reply->str);
+               throw DatabaseException(std::string(
+                       "Failed to get keys from database: ") +
+                       std::string(reply->str, reply->len));
        }
        freeReplyObject(reply);
 }