Browse Source

slightly revised the testing routing; added "dump everything to redis" function

git.mgm/mediaproxy-ng/2.0
Richard Fuchs 15 years ago
parent
commit
9ef47a4906
4 changed files with 37 additions and 2 deletions
  1. +20
    -0
      daemon/call.c
  2. +1
    -0
      daemon/call.h
  3. +15
    -2
      daemon/redis.c
  4. +1
    -0
      daemon/redis.h

+ 20
- 0
daemon/call.c View File

@ -1176,3 +1176,23 @@ void call_restore(struct callmaster *m, char *uuid, redisReply **hash, GList *st
kernelize(cs);
}
}
static void calls_dump_iterator(void *key, void *val, void *ptr) {
struct call *c = val;
redis_update(c);
}
void calls_dump_redis(struct callmaster *m) {
if (!m->redis)
return;
mylog(LOG_DEBUG, "Start dumping all call data to Redis...\n");
redis_wipe(m);
g_hash_table_foreach(m->callhash, calls_dump_iterator, NULL);
mylog(LOG_DEBUG, "Finished dumping all call data to Redis\n");
}

+ 1
- 0
daemon/call.h View File

@ -105,6 +105,7 @@ char *call_delete_udp(const char **, struct callmaster *);
void calls_status(struct callmaster *, struct control_stream *);
void call_restore(struct callmaster *, char *, redisReply **, GList *);
void calls_dump_redis(struct callmaster *);


+ 15
- 2
daemon/redis.c View File

@ -29,8 +29,8 @@ To fill the redis DB with expiring test data:
echo "hmset $b callid $(uuid)@test created $(date +%s)"
c=$(uuid)
echo "rpush $b-streams $c"
echo "hmset $c:0 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $(($RANDOM % 10000 + 1024)) localport $(($RANDOM % 10000 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)"
echo "hmset $c:1 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $(($RANDOM % 10000 + 1024)) localport $(($RANDOM % 10000 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)"
echo "hmset $c:0 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $((($RANDOM % 10000) * 2 + 1024)) localport $((($RANDOM % 10000) * 2 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)"
echo "hmset $c:1 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $((($RANDOM % 10000) * 2 + 1024)) localport $((($RANDOM % 10000) * 2 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)"
echo "expire $b $expire"
echo "expire $b-streams $expire"
echo "expire $c:0 $expire"
@ -370,3 +370,16 @@ void redis_update(struct call *c) {
void redis_delete(struct call *c) {
redis_delete_uuid(c->redis_uuid, c->callmaster);
}
void redis_wipe(struct callmaster *m) {
struct redis *r = m->redis;
if (!r)
return;
redisCommandNR(r->ctx, "DEL calls");
}

+ 1
- 0
daemon/redis.h View File

@ -30,6 +30,7 @@ struct redis *redis_new(u_int32_t, u_int16_t, int);
int redis_restore(struct callmaster *);
void redis_update(struct call *);
void redis_delete(struct call *);
void redis_wipe(struct callmaster *);


Loading…
Cancel
Save