Optimize headers (part 2) (#6272)

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

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index 01427b6f96e7ad7e8959880b71790103b526eb3e..096ea504db12c82d08094cd2ab9591c8ccfd2629 100644 (file)
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -38,19 +38,32 @@ Database_Redis::Database_Redis(Settings &conf)
        try {
                tmp = conf.get("redis_address");
                hash = conf.get("redis_hash");
-       } catch (SettingNotFoundException) {
+       } catch (SettingNotFoundException &) {
                throw SettingNotFoundException("Set redis_address and "
                        "redis_hash in world.mt to use the redis backend");
        }
        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);
@@ -108,7 +121,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
                        "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);
        }
 
@@ -124,7 +137,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
                freeReplyObject(reply);
                errorstream << "loadBlock: loading block " << PP(pos)
                        << " failed: " << errstr << std::endl;
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Redis command 'HGET %s %s' errored: ") + errstr);
        }
        case REDIS_REPLY_NIL: {
@@ -139,7 +152,7 @@ void Database_Redis::loadBlock(const v3s16 &pos, std::string *block)
                << " returned invalid reply type " << reply->type
                << ": " << std::string(reply->str, reply->len) << std::endl;
        freeReplyObject(reply);
-       throw FileNotGoodException(std::string(
+       throw DatabaseException(std::string(
                "Redis command 'HGET %s %s' gave invalid reply."));
 }
 
@@ -150,7 +163,7 @@ 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) {
                warningstream << "deleteBlock: deleting block " << PP(pos)
@@ -167,7 +180,7 @@ 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) {
@@ -179,7 +192,7 @@ void Database_Redis::listAllLoadableBlocks(std::vector<v3s16> &dst)
                }
                break;
        case REDIS_REPLY_ERROR:
-               throw FileNotGoodException(std::string(
+               throw DatabaseException(std::string(
                        "Failed to get keys from database: ") +
                        std::string(reply->str, reply->len));
        }