fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-22 13:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Final merge of Sentinel into 2.6.

Browse Source 
After cherry-picking Sentinel commits a few spurious issues remained
about references to Redis Cluster that is not present in the 2.6 branch.
This commit is contained in:
antirez
2012-09-27 13:10:36 +02:00
parent dfb7194cba
commit c4cbffa3a1
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/redis.c
View File

@ -1827,8 +1827,7 @@ sds genRedisInfoString(char *section) {
struct utsname name;
char *mode;
if (server.cluster_enabled) mode = "cluster";
else if (server.sentinel_mode) mode = "sentinel";
if (server.sentinel_mode) mode = "sentinel";
else mode = "standalone";
if (sections++) info = sdscat(info,"\r\n");
@ -2415,20 +2414,14 @@ void redisAsciiArt(void) {
char *buf = zmalloc(1024*16);
char *mode = "stand alone";
if (server.cluster_enabled) mode = "cluster";
else if (server.sentinel_mode) mode = "sentinel";
if (server.sentinel_mode) mode = "sentinel";
snprintf(buf,1024*16,ascii_logo,
REDIS_VERSION,
redisGitSHA1(),
strtol(redisGitDirty(),NULL,10) > 0,
(sizeof(long) == 8) ? "64" : "32",
<<<<<<< HEAD
"stand alone",
server.port,
=======
mode, server.port,
>>>>>>> 6b5daa2... First implementation of Redis Sentinel.
(long) getpid()
);
redisLogRaw(REDIS_NOTICE|REDIS_LOG_RAW,buf);
@ -2466,12 +2459,6 @@ void setupSignalHandlers(void) {
void memtest(size_t megabytes, int passes);
<<<<<<< HEAD
void redisOutOfMemoryHandler(size_t allocation_size) {
redisLog(REDIS_WARNING,"Out Of Memory allocating %zu bytes!",
allocation_size);
redisPanic("OOM");
=======
/* Returns 1 if there is --sentinel among the arguments or if
* argv[0] is exactly "redis-sentinel". */
int checkForSentinelMode(int argc, char **argv) {
@ -2498,7 +2485,12 @@ void loadDataFromDisk(void) {
exit(1);
}
}
>>>>>>> 6b5daa2... First implementation of Redis Sentinel.
}
void redisOutOfMemoryHandler(size_t allocation_size) {
redisLog(REDIS_WARNING,"Out Of Memory allocating %zu bytes!",
allocation_size);
redisPanic("OOM");
}
int main(int argc, char **argv) {