renamed handle_request -> handle_il_message

removed trans_db_store

diff --git a/org.glite.lb.server/src/jobstat.c b/org.glite.lb.server/src/jobstat.c
index 0908119..2130ba0 100644 (file)
--- a/org.glite.lb.server/src/jobstat.c
+++ b/org.glite.lb.server/src/jobstat.c
@@ -798,7 +798,7 @@ static int log_collectionState_event(edg_wll_Context ctx, edg_wll_JobStatCode st
        edg_wlc_JobIdDup(cis->pub.jobId, &(event->collectionState.child));
        event->collectionState.child_event = edg_wll_EventToString(ce->any.type);
 
-       ret = trans_db_store(ctx, NULL, event, pis);
+       ret = db_parent_store(ctx, event, pis);
 
        edg_wll_FreeEvent(event);
        free(event);

diff --git a/org.glite.lb.server/src/request.c b/org.glite.lb.server/src/request.c
index de2326c..4589bab 100644 (file)
--- a/org.glite.lb.server/src/request.c
+++ b/org.glite.lb.server/src/request.c
@@ -19,32 +19,8 @@
 #endif
 
 
-int
-trans_db_store(edg_wll_Context ctx, char *event_data, edg_wll_Event *e, intJobStat *is)
-{
-  int ret;
-  char *errd = NULL;
-
-  if ((ret = edg_wll_Transaction(ctx) != 0)) goto err;
-
-  if (e) ret = db_parent_store(ctx, e, is);
-  else ret = db_store(ctx, "NOT USED", event_data);
-
-  if (ret == 0) {
-    if ((ret = edg_wll_Commit(ctx)) != 0) goto err;
-  } else {
-    edg_wll_Error(ctx, NULL, &errd);
-    edg_wll_Rollback(ctx);
-    edg_wll_SetError(ctx, ret, errd);
-    free(errd);
-  }
-
-err:
-  return(ret);
-}
-    
 int 
-handle_request(edg_wll_Context ctx,char *buf)
+handle_il_message(edg_wll_Context ctx,char *buf)
 {
        il_octet_string_t event;
   int ret;
@@ -57,7 +33,7 @@ handle_request(edg_wll_Context ctx,char *buf)
     return EDG_WLL_IL_PROTO;
   }
 
-  ret = trans_db_store(ctx, event.data, NULL, NULL);
+  ret = db_store(ctx, "NOT USED", event.data);
 
   if(event.data)
     free(event.data);

diff --git a/org.glite.lb.server/src/stored_master.c b/org.glite.lb.server/src/stored_master.c
index 2b5b54a..4e8ecab 100644 (file)
--- a/org.glite.lb.server/src/stored_master.c
+++ b/org.glite.lb.server/src/stored_master.c
@@ -92,7 +92,7 @@ int edg_wll_StoreProtoServer(edg_wll_Context ctx)
        else
 #endif
 
-       handle_request(ctx,buf);
+       handle_il_message(ctx,buf);
        free(buf);
 
        if ((len = create_reply(ctx,&buf)) > 0) {
@@ -145,7 +145,7 @@ int edg_wll_StoreProtoProxy(edg_wll_Context ctx)
        if (sink_mode == GLITE_LB_SINK_PARSE) glite_wll_perftest_consumeEventIlMsg(buf);
        else
 #endif
-       if ( !(ret = handle_request(ctx, buf)) ) {
+       if ( !(ret = handle_il_message(ctx, buf)) ) {
                if ( (err = edg_wll_Error(ctx, NULL, &errd)) ) edg_wll_ResetError(ctx);
        }
        free(buf);