@@ -3644,7 +3657,7 @@ int redisIsSupervised(void) {
sendto_flags|=MSG_NOSIGNAL;
#endif
if(sendmsg(fd,&hdr,sendto_flags)<0){
redisLog(REDIS_WARNING,"Cannot send notification to systemd");
redisLog(REDIS_WARNING,"Can't send notification to systemd");
close(fd);
return0;
}
...
...
@@ -3652,6 +3665,26 @@ int redisIsSupervised(void) {
return1;
}
intredisIsSupervised(intmode){
if(mode==REDIS_SUPERVISED_AUTODETECT){
constchar*upstart_job=getenv("UPSTART_JOB");
constchar*notify_socket=getenv("NOTIFY_SOCKET");
if(upstart_job){
redisSupervisedUpstart();
}elseif(notify_socket){
redisSupervisedSystemd();
}
}elseif(mode==REDIS_SUPERVISED_UPSTART){
returnredisSupervisedUpstart();
}elseif(mode==REDIS_SUPERVISED_SYSTEMD){
returnredisSupervisedSystemd();
}
return0;
}
intmain(intargc,char**argv){
structtimevaltv;
...
...
@@ -3758,10 +3791,11 @@ int main(int argc, char **argv) {
redisLog(REDIS_WARNING,"Warning: no config file specified, using the default config. In order to specify a config file use %s /path/to/%s.conf",argv[0],server.sentinel_mode?"sentinel":"redis");