mirror of
https://github.com/fluencelabs/redis
synced 2025-03-17 16:10:50 +00:00
if /dev/urandom is not available use rand() to get a random node name
This commit is contained in:
parent
35845afba0
commit
a5dce40726
@ -24,12 +24,10 @@ void clusterGetRandomName(char *p) {
|
||||
char *charset = "0123456789abcdef";
|
||||
int j;
|
||||
|
||||
if (!fp) {
|
||||
redisLog(REDIS_WARNING,
|
||||
"Unrecovarable error: can't open /dev/urandom:%s" ,strerror(errno));
|
||||
exit(1);
|
||||
if (fp == NULL || fread(p,REDIS_CLUSTER_NAMELEN,1,fp) == 0) {
|
||||
for (j = 0; j < REDIS_CLUSTER_NAMELEN; j++)
|
||||
p[j] = rand();
|
||||
}
|
||||
fread(p,REDIS_CLUSTER_NAMELEN,1,fp);
|
||||
for (j = 0; j < REDIS_CLUSTER_NAMELEN; j++)
|
||||
p[j] = charset[p[j] & 0x0F];
|
||||
fclose(fp);
|
||||
|
@ -1233,7 +1233,7 @@ int zuiNext(zsetopsrc *op, zsetopval *val) {
|
||||
if (op->type == REDIS_SET) {
|
||||
iterset *it = &op->iter.set;
|
||||
if (op->encoding == REDIS_ENCODING_INTSET) {
|
||||
if (!intsetGet(it->is.is,it->is.ii,&val->ell))
|
||||
if (!intsetGet(it->is.is,it->is.ii,(int64_t*)&val->ell))
|
||||
return 0;
|
||||
val->score = 1.0;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user