From a20978474d72c79005478d2eee634bcfb3babe90 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michal=20Voc=C5=AF?= Date: Thu, 1 Mar 2012 14:14:12 +0000 Subject: [PATCH] move owner handling to one place, handle correctly move_events() --- org.glite.lb.logger/src/event_queue.c | 13 ------------- org.glite.lb.logger/src/event_store.c | 17 +++++++++++++++++ 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/org.glite.lb.logger/src/event_queue.c b/org.glite.lb.logger/src/event_queue.c index 059d838..f8ec91a 100644 --- a/org.glite.lb.logger/src/event_queue.c +++ b/org.glite.lb.logger/src/event_queue.c @@ -257,19 +257,6 @@ event_queue_insert(struct event_queue *eq, struct server_msg *msg) if(++eq->cur_len > eq->max_len) eq->max_len = eq->cur_len; -#ifdef IL_NOTIFICATIONS - if(msg->owner) { - if(eq->owner) { - if(strcmp(eq->owner, msg->owner)) { - free(eq->owner); - eq->owner = strdup(msg->owner); - } - } else { - eq->owner = strdup(msg->owner); - } - } -#endif /* IL_NOTIFICATIONS */ - event_queue_unlock(eq); /* end of critical section */ diff --git a/org.glite.lb.logger/src/event_store.c b/org.glite.lb.logger/src/event_store.c index eac08d3..9a8ada4 100644 --- a/org.glite.lb.logger/src/event_store.c +++ b/org.glite.lb.logger/src/event_store.c @@ -785,6 +785,18 @@ event_store_recover(struct event_store *es) } } + /* check message owner */ + if(msg->owner) { + if(eq_b->owner) { + if(strcmp(eq_b->owner, msg->owner)) { + free(eq_b->owner); + eq_b->owner = strdup(msg->owner); + } + } else { + eq_b->owner = strdup(msg->owner); + } + } + /* check message expiration */ if(last_exp == 0 || last_exp != msg->expires) { last_exp = msg->expires; @@ -849,6 +861,11 @@ event_store_recover(struct event_store *es) /* move all events with this notif_id from eq_b to eq_dest */ event_queue_move_events(eq_b, eq_dest, cmp_jobid, es->job_id_s); + if(eq_dest->owner) { + /* XXX - is it possible that eq_dest->owner is different than eq_b->owner? Should not... but... */ + } else { + eq_dest->owner = strdup(eq_b->owner); + } eq_b = eq_dest; glite_common_log(IL_LOG_CATEGORY, LOG_PRIORITY_INFO, " all messages for notif id %s are now destined to %s", -- 1.8.2.3