fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-04-06 09:41:02 +00:00
Code Issues Projects Releases Wiki Activity

Sentinel: log +monitor and +set events.

Browse Source 
Now that we have a runtime configuration system, it is very important to
be able to log how the Sentinel configuration changes over time because
of API calls.
This commit is contained in:
antirez 2014-02-24 16:25:34 +01:00
parent 25cebf7285
commit 3b7a757468
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/sentinel.c
View File

@ -2503,6 +2503,7 @@ void sentinelCommand(redisClient *c) {
sentinelPendingScriptsCommand(c); sentinelPendingScriptsCommand(c);
} else if (!strcasecmp(c->argv[1]->ptr,"monitor")) { } else if (!strcasecmp(c->argv[1]->ptr,"monitor")) {
/* SENTINEL MONITOR <name> <ip> <port> <quorum> */ /* SENTINEL MONITOR <name> <ip> <port> <quorum> */
sentinelRedisInstance *ri;
long quorum, port; long quorum, port;
char buf[32]; char buf[32];
@ -2518,9 +2519,11 @@ void sentinelCommand(redisClient *c) {
addReplyError(c,"Invalid IP address specified"); addReplyError(c,"Invalid IP address specified");
return; return;
} }
if (createSentinelRedisInstance(c->argv[2]->ptr,SRI_MASTER,
c->argv[3]->ptr,port,quorum,NULL) == NULL) /* Parameters are valid. Try to create the master instance. */
{ ri = createSentinelRedisInstance(c->argv[2]->ptr,SRI_MASTER,
c->argv[3]->ptr,port,quorum,NULL);
if (ri == NULL) {
switch(errno) { switch(errno) {
case EBUSY: case EBUSY:
addReplyError(c,"Duplicated master name"); addReplyError(c,"Duplicated master name");
@ -2534,6 +2537,7 @@ void sentinelCommand(redisClient *c) {
} }
} else { } else {
sentinelFlushConfig(); sentinelFlushConfig();
sentinelEvent(REDIS_WARNING,"+monitor",ri,"%@");
addReply(c,shared.ok); addReply(c,shared.ok);
} }
} else if (!strcasecmp(c->argv[1]->ptr,"remove")) { } else if (!strcasecmp(c->argv[1]->ptr,"remove")) {
@ -2542,6 +2546,7 @@ void sentinelCommand(redisClient *c) {
if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2])) if ((ri = sentinelGetMasterByNameOrReplyError(c,c->argv[2]))
== NULL) return; == NULL) return;
sentinelEvent(REDIS_WARNING,"-monitor",ri,"%@");
dictDelete(sentinel.masters,c->argv[2]->ptr); dictDelete(sentinel.masters,c->argv[2]->ptr);
sentinelFlushConfig(); sentinelFlushConfig();
addReply(c,shared.ok); addReply(c,shared.ok);
@ -2693,6 +2698,7 @@ void sentinelSetCommand(redisClient *c) {
if (changes) sentinelFlushConfig(); if (changes) sentinelFlushConfig();
return; return;
} }
sentinelEvent(REDIS_WARNING,"+set",ri,"%@ %s %s",option,value);
} }
if (changes) sentinelFlushConfig(); if (changes) sentinelFlushConfig();