Translated using Weblate (German)

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

diff --git a/src/database-redis.cpp b/src/database-redis.cpp
index d7f5379772822529bbfb91dece3a9372eecf98b6..b15f546b2ec245c51d308fc3edce7960eae51cd7 100644 (file)
--- a/src/database-redis.cpp
+++ b/src/database-redis.cpp
@@ -84,14 +84,14 @@ 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)
+               warningstream << "saveBlock: saving block " << PP(pos)
                        << " failed: " << reply->str << std::endl;
                freeReplyObject(reply);
                return false;
@@ -126,6 +126,11 @@ std::string Database_Redis::loadBlock(const v3s16 &pos)
                throw FileNotGoodException(std::string(
                        "Redis command 'HGET %s %s' errored: ") + errstr);
        }
+       case REDIS_REPLY_NIL: {
+               // block not found in database
+               freeReplyObject(reply);
+               return "";
+       }
        }
        errorstream << "loadBlock: loading block " << PP(pos)
                << " returned invalid reply type " << reply->type
@@ -145,7 +150,7 @@ bool Database_Redis::deleteBlock(const v3s16 &pos)
                throw FileNotGoodException(std::string(
                        "Redis command 'HDEL %s %s' failed: ") + ctx->errstr);
        } else if (reply->type == REDIS_REPLY_ERROR) {
-               errorstream << "WARNING: deleteBlock: deleting block " << PP(pos)
+               warningstream << "deleteBlock: deleting block " << PP(pos)
                        << " failed: " << reply->str << std::endl;
                freeReplyObject(reply);
                return false;