From 3d11d3afdb9a7b8b49bee59093decbd32ca5265c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ji=C5=99=C3=AD=20Filipovi=C4=8D?= Date: Fri, 5 Mar 2010 13:19:31 +0000 Subject: [PATCH] - implemented logging in *.c.T - minor fixes in logging in the rest of the code --- org.glite.lb.server/src/bkserverd.c | 47 ++++++++++++++-------------- org.glite.lb.server/src/db_supp.c | 5 ++- org.glite.lb.server/src/get_events.c.T | 11 +++++-- org.glite.lb.server/src/jobstat_supp.c | 1 - org.glite.lb.server/src/lb_http.c | 6 ++-- org.glite.lb.server/src/lb_xml_parse.c.T | 2 +- org.glite.lb.server/src/lb_xml_parse_V21.c.T | 2 +- org.glite.lb.server/src/notif_match.c | 1 - org.glite.lb.server/src/query.c | 4 +-- org.glite.lb.server/src/srv_purge.c | 13 ++++---- org.glite.lb.server/src/stats.c | 11 ++++--- org.glite.lb.server/src/store.c.T | 33 +++++++++++++++++-- org.glite.lb.server/src/stored_master.c | 2 +- org.glite.lb.server/src/ws_lb4agu.c | 10 +++--- org.glite.lb.server/src/ws_query.c | 26 +++++++-------- 15 files changed, 102 insertions(+), 72 deletions(-) diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c index 7c149bc..22577e5 100644 --- a/org.glite.lb.server/src/bkserverd.c +++ b/org.glite.lb.server/src/bkserverd.c @@ -492,7 +492,7 @@ int main(int argc, char *argv[]) setlinebuf(stderr); if (glite_common_log_init()) { - fprintf(stderr,"glite_common_log_init() failed, exiting.\n"); + fprintf(stderr,"glite_common_log_init() failed, exiting."); exit(1); } glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_INFO, "Initializing..."); @@ -802,6 +802,7 @@ int main(int argc, char *argv[]) glite_srvbones_set_param(GLITE_SBPARAM_REQUEST_TIMEOUT, &to); to = (struct timeval){IDLE_TIMEOUT, 0}; glite_srvbones_set_param(GLITE_SBPARAM_IDLE_TIMEOUT, &to); + glite_srvbones_set_param(GLITE_SBPARAM_LOG_REQ_CATEGORY, LOG_CATEGORY_LB_SERVER_REQUEST); switch (mode) { case SERVICE_PROXY: @@ -906,8 +907,7 @@ int bk_clnt_data_init(void **data) char *et, *ed; edg_wll_Error(ctx,&et,&ed); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "[%d]: query_job_indices(): %s: %s, no custom indices available", getpid(), et, ed); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_DEBUG, "[%d]: query_job_indices(): %s: %s, no custom indices available", getpid(), et, ed); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d]: query_job_indices(): %s: %s, no custom indices available", getpid(), et, ed); free(et); free(ed); } @@ -918,8 +918,7 @@ int bk_clnt_data_init(void **data) char *et,*ed; edg_wll_Error(ctx,&et,&ed); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "[%d]: query notif indices: %s: %s", getpid(), et, ed); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_DEBUG, "[%d]: query notif indices: %s: %s", getpid(), et, ed); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d]: query notif indices: %s: %s", getpid(), et, ed); free(et); free(ed); } @@ -968,7 +967,7 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) edg_wll_gss_release_cred(&mycred, NULL); mycred = newcred; } else { - glite_common_log(LOG_CATEGORY_SECURITY, LOG_PRIORITY_ERROR, "[%d] reloading credentials failed, using old ones"); + glite_common_log(LOG_CATEGORY_SECURITY, LOG_PRIORITY_WARN, "[%d] reloading credentials failed, using old ones"); } break; case -1: @@ -1030,15 +1029,15 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) { case NETDB_SUCCESS: if (name) - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_INFO, "[%d] connection from %s:%d (%s)", getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port), name); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_INFO, "[%d] connection from %s:%d (%s)", getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port), name); free(ctx->connections->serverConnection->peerName); ctx->connections->serverConnection->peerName = name; name = NULL; break; default: - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_DEBUG, "gethostbyaddr(%s): %s", inet_ntoa(a.sin_addr), hstrerror(h_errno)); - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_INFO,"[%d] connection from %s:%d", getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port)); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "gethostbyaddr(%s): %s", inet_ntoa(a.sin_addr), hstrerror(h_errno)); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_INFO,"[%d] connection from %s:%d", getpid(), inet_ntoa(a.sin_addr), ntohs(a.sin_port)); free(ctx->connections->serverConnection->peerName); ctx->connections->serverConnection->peerName = strdup(inet_ntoa(a.sin_addr)); break; @@ -1047,7 +1046,7 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) gettimeofday(&now, 0); if ( decrement_timeout(timeout, conn_start, now) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, "gethostbyaddr() timeout"); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_WARN, "gethostbyaddr() timeout"); free(name); return -1; @@ -1077,7 +1076,7 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) { if ( strcmp(name, server_name)) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, "different server endpoint names (%s,%s), check DNS PTR records", name, server_name); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "different server endpoint names (%s,%s), check DNS PTR records", name, server_name); } } else server_name = strdup(name); @@ -1111,7 +1110,7 @@ int bk_handle_connection(int conn, struct timeval *timeout, void *data) edg_wll_FreeContext(ctx); return -1; } - glite_common_log(LOG_CATEGORY_SECURITY, LOG_PRIORITY_ERROR, "[%d] %s: GSS error: %s", getpid(), ctx->connections->serverConnection->peerName, ctx->errDesc); + glite_common_log(LOG_CATEGORY_SECURITY, LOG_PRIORITY_WARN, "[%d] %s: GSS error: %s", getpid(), ctx->connections->serverConnection->peerName, ctx->errDesc); } else { @@ -1184,13 +1183,13 @@ int bk_init_ws_connection(struct clnt_data_t *cdata) int err = 0; if ( glite_gsplugin_init_context(&gsplugin_ctx) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "Couldn't create gSOAP plugin context"); return -1; } if ( !(soap = soap_new()) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "Couldn't create soap environment"); goto err; } @@ -1198,13 +1197,13 @@ int bk_init_ws_connection(struct clnt_data_t *cdata) soap_init2(soap, SOAP_IO_KEEPALIVE, SOAP_IO_KEEPALIVE); if ( soap_set_namespaces(soap, namespaces) ) { soap_done(soap); - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "Couldn't set soap namespaces"); goto err; } if ( soap_register_plugin_arg(soap, glite_gsplugin, gsplugin_ctx) ) { soap_done(soap); - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "Couldn't set soap namespaces"); goto err; } @@ -1301,7 +1300,7 @@ int bk_handle_connection_proxy(int conn, struct timeval *timeout, void *data) gettimeofday(&conn_start, 0); if ( edg_wll_plain_accept(conn, &ctx->connProxy->conn) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "accept"); edg_wll_FreeContext(ctx); @@ -1310,7 +1309,7 @@ int bk_handle_connection_proxy(int conn, struct timeval *timeout, void *data) gettimeofday(&now, 0); if ( decrement_timeout(timeout, conn_start, now) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_WARN, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "edg_wll_plain_accept(): timeout"); return -1; } @@ -1352,7 +1351,7 @@ static int handle_server_error(edg_wll_Context ctx) case EEXIST: case EDG_WLL_ERROR_NOINDEX: case E2BIG: - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d] %s (%s)", getpid(), errt, errd); break; case EINVAL: @@ -1364,7 +1363,7 @@ static int handle_server_error(edg_wll_Context ctx) case EDG_WLL_ERROR_PARSE_OK_WITH_EXTRA_FIELDS: case EDG_WLL_ERROR_JOBID_FORMAT: case EDG_WLL_ERROR_MD5_CLASH: - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d] %s (%s)", getpid(), errt, errd); /* * no action for non-fatal errors @@ -1401,7 +1400,7 @@ int bk_accept_store(int conn, struct timeval *timeout, void *cdata) gettimeofday(&after, NULL); if ( decrement_timeout(timeout, before, after) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_WARN, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_WARN, "Serving store connection timed out"); return ETIMEDOUT; } @@ -1475,7 +1474,7 @@ int bk_accept_serve(int conn, struct timeval *timeout, void *cdata) gettimeofday(&after, NULL); if ( decrement_timeout(timeout, before, after) ) { - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_WARN, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_WARN, "Serving store connection timed out"); return ETIMEDOUT; @@ -1532,7 +1531,7 @@ int bk_accept_ws(int conn, struct timeval *timeout, void *cdata) if ( err ) { // soap_print_fault(struct soap *soap, FILE *fd) maybe useful here - glite_common_log(LOG_CATEGORY_ACCESS, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_WARN, "[%d] SOAP error (bk_accept_ws)", getpid()); return ECANCELED; } @@ -1655,7 +1654,7 @@ static int wait_for_open(edg_wll_Context ctx, const char *dbstring) asprintf(&dbfail_string1,"%s (%s)",errt,errd); free(errt); free(errd); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d]: %s", getpid(), dbfail_string1); free(dbfail_string1); } diff --git a/org.glite.lb.server/src/db_supp.c b/org.glite.lb.server/src/db_supp.c index 2ed512d..98d09b0 100644 --- a/org.glite.lb.server/src/db_supp.c +++ b/org.glite.lb.server/src/db_supp.c @@ -1,6 +1,5 @@ #include #include -#include #include #include @@ -100,7 +99,7 @@ int edg_wll_TransNeedRetry(edg_wll_Context ctx) { if (ret == EDG_WLL_ERROR_DB_TRANS_DEADLOCK) { glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_INFO, "[%d]: DB deadlock detected. Rolling back transaction " - "and retrying... \n", getpid()); + "and retrying...", getpid()); edg_wll_ResetError(ctx); return !edg_wll_Rollback(ctx); @@ -108,7 +107,7 @@ int edg_wll_TransNeedRetry(edg_wll_Context ctx) { if (ret == EDG_WLL_ERROR_DB_LOST_CONNECTION) { glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_INFO, "[%d]: Lost connection to DB. " - "Rolling back transaction and retrying... \n", + "Rolling back transaction and retrying...", getpid()); edg_wll_ResetError(ctx); diff --git a/org.glite.lb.server/src/get_events.c.T b/org.glite.lb.server/src/get_events.c.T index c3636dc..14b7834 100644 --- a/org.glite.lb.server/src/get_events.c.T +++ b/org.glite.lb.server/src/get_events.c.T @@ -15,9 +15,9 @@ #include #include #include -#include #include "glite/lbu/trio.h" +#include "glite/lbu/log.h" #include "get_events.h" #include "glite/lb/context-int.h" #include "glite/lb/events_parse.h" @@ -38,6 +38,8 @@ int edg_wll_get_event_flesh(edg_wll_Context ctx,int n,edg_wll_Event *e) edg_wll_ResetError(ctx); trio_asprintf(&q, "select ulm from events_flesh where jobid = '%|Ss' and event = %d", jobid, n); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, q); + if ((ret=edg_wll_ExecSQL(ctx,q,&sh)) < 0) goto cleanup; if (edg_wll_FetchRow(ctx,sh,1,NULL,&nameval[0]) == 1) { //fprintf(stderr, "got ulm: '%s'\n", nameval[0]); @@ -61,6 +63,8 @@ int edg_wll_get_event_flesh(edg_wll_Context ctx,int n,edg_wll_Event *e) trio_asprintf(&q,"select name,value from %s " "where jobid = '%|Ss' and event = %d ", tables[t],jobid,n); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, + q); if ((ret=edg_wll_ExecSQL(ctx,q,&sh)) < 0) goto cleanup; @@ -99,8 +103,9 @@ static void edg_wll_set_event_field_warn( { char *e = edg_wll_EventToString(event->any.type); - fprintf(stderr, "edg_wll_set_event_field: bad field:" - "code=\"%s\" name=\"%s\" value=\"%s\"\n", + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, + "edg_wll_set_event_field: bad field:" + "code=\"%s\" name=\"%s\" value=\"%s\"", e, name, value); free(e); /* XXX edg_wll_Log */ diff --git a/org.glite.lb.server/src/jobstat_supp.c b/org.glite.lb.server/src/jobstat_supp.c index 3e5467f..3bf9dab 100644 --- a/org.glite.lb.server/src/jobstat_supp.c +++ b/org.glite.lb.server/src/jobstat_supp.c @@ -8,7 +8,6 @@ #include #include #include -#include #include "glite/jobid/cjobid.h" #include "glite/lbu/trio.h" diff --git a/org.glite.lb.server/src/lb_http.c b/org.glite.lb.server/src/lb_http.c index 62dc1c0..0d7b3f1 100644 --- a/org.glite.lb.server/src/lb_http.c +++ b/org.glite.lb.server/src/lb_http.c @@ -29,14 +29,14 @@ int edg_wll_AcceptHTTP(edg_wll_Context ctx, char **body, char **resp, char ***hd else err = edg_wll_http_recv(ctx,&req,&hdr,body,ctx->connections->serverConnection); if (req) - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG4C_PRIORITY_DEBUG, "[%d] request: %s", getpid(), req); else - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG4C_PRIORITY_DEBUG, "no request"); if (body && *body) - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG4C_PRIORITY_DEBUG, "request body:\n%s",*body); if (!err) { diff --git a/org.glite.lb.server/src/lb_xml_parse.c.T b/org.glite.lb.server/src/lb_xml_parse.c.T index 287d2d3..e6222db 100644 --- a/org.glite.lb.server/src/lb_xml_parse.c.T +++ b/org.glite.lb.server/src/lb_xml_parse.c.T @@ -252,7 +252,7 @@ static void startQueryEventsRequest(void *data, const char *el, const char **att if (!attr[0] || !attr[1]) { unexp() break;} if (attr[0] && strcmp(attr[0],"state")) { unexp() break;} XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]); - printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1])); + //printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1])); } XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr = i+1; } diff --git a/org.glite.lb.server/src/lb_xml_parse_V21.c.T b/org.glite.lb.server/src/lb_xml_parse_V21.c.T index a726d0b..559c8b4 100644 --- a/org.glite.lb.server/src/lb_xml_parse_V21.c.T +++ b/org.glite.lb.server/src/lb_xml_parse_V21.c.T @@ -202,7 +202,7 @@ static void startQueryEventsRequest(void *data, const char *el, const char **att if (!attr[0] || !attr[1]) { unexp() break;} if (attr[0] && strcmp(attr[0],"state")) { unexp() break;} XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr_id.state = edg_wll_StringToStat(attr[1]); - printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1])); + //printf("\nchecking time attr\n%s = %s (%d)\n\n", attr[0], attr[1], edg_wll_StringToStat(attr[1])); } XMLCtx->job_conditions[XMLCtx->row][XMLCtx->position].attr = i+1; } diff --git a/org.glite.lb.server/src/notif_match.c b/org.glite.lb.server/src/notif_match.c index 5810271..589e128 100644 --- a/org.glite.lb.server/src/notif_match.c +++ b/org.glite.lb.server/src/notif_match.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c index 60e470e..c69d05e 100644 --- a/org.glite.lb.server/src/query.c +++ b/org.glite.lb.server/src/query.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -180,8 +179,7 @@ int edg_wll_QueryEventsServer( edg_wll_Error(ctx,&et,&ed); dbjob = res[2]; - fprintf(stderr,"%s event %d: %s (%s)\n",dbjob,n,et,ed); - syslog(LOG_WARNING,"%s event %d: %s (%s)",dbjob,n,et,ed); + glite_common_log(LOG_CATEGORY_LB_SERVER, LOG_PRIORITY_WARN, "%s event %d: %s (%s)", dbjob, n, et, ed); free(et); free(ed); edg_wll_ResetError(ctx); diff --git a/org.glite.lb.server/src/srv_purge.c b/org.glite.lb.server/src/srv_purge.c index b61c024..11ece50 100644 --- a/org.glite.lb.server/src/srv_purge.c +++ b/org.glite.lb.server/src/srv_purge.c @@ -4,7 +4,6 @@ #include #include #include -#include #include #include #include @@ -282,13 +281,13 @@ int edg_wll_PurgeServer(edg_wll_Context ctx,const edg_wll_PurgeRequest *request, for (prg.jobs_to_exa=0; request->jobs[prg.jobs_to_exa]; prg.jobs_to_exa++); for (i=0; request->jobs[i] && !purge_quit; i++) { if (edg_wlc_JobIdParse(request->jobs[i],&job)) { - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "%s: parse error\n", request->jobs[i]); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "%s: parse error", request->jobs[i]); prg.parse = 1; prg.jobs_to_exa--; } else { if (check_strict_jobid(ctx,job)) { - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "%s: not my job\n", request->jobs[i]); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "%s: not my job", request->jobs[i]); prg.parse = 1; prg.jobs_to_exa--; } @@ -764,8 +763,10 @@ int purge_one(edg_wll_Context ctx,edg_wll_JobStat *stat,int dump, int purge, int if ( jobtype == EDG_WLL_NUMBER_OF_JOBTYPES) goto rollback; if (get_jobid_suffix(ctx, job, jobtype, &root, &suffix) || get_jobid_prefix(ctx, job, jobtype, &prefix)) { - fprintf(stderr,"[%d] unknown job type of the '%s'.\n", getpid(), dbjob); - syslog(LOG_WARNING,"Warning: unknown job type of the '%s'", dbjob); + glite_common_log(LOG_CATEGORY_CONTROL, + LOG_PRIORITY_WARN, + "[%d] unknown job type of the '%s'.", + getpid(), dbjob); edg_wll_ResetError(ctx); } } @@ -874,7 +875,7 @@ int purge_one(edg_wll_Context ctx,edg_wll_JobStat *stat,int dump, int purge, int asprintf(&msg,"Warning: erasing job %s that already existed in this LB " "(reused jobid or corruped DB) (%s: %s)",job_s,et,ed); - glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d] %s\n", getpid(), msg); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_WARN, "[%d] %s", getpid(), msg); free(et); free(ed); free(msg); free(job_s); edg_wll_ResetError(ctx); } diff --git a/org.glite.lb.server/src/stats.c b/org.glite.lb.server/src/stats.c index a302f5b..b0822ab 100644 --- a/org.glite.lb.server/src/stats.c +++ b/org.glite.lb.server/src/stats.c @@ -131,7 +131,9 @@ static struct edg_wll_stats_archive *archive_skip( static int stats_remap(edg_wll_Stats *stats) { int newgrpno = stats->map->grpno; - dprintf(("stats_remap: size changed (%d != %d), remap",stats->grpno,newgrpno)); + glite_common_log(LOG_CATEGORY_LB_SERVER, LOG_PRIORITY_DEBUG, + "stats_remap: size changed (%d != %d), remap", + stats->grpno, newgrpno); munmap(stats->map,(stats->grpno ? stats->grpno : 1) * stats->grpsize); stats->map = mmap(NULL,newgrpno * stats->grpsize, PROT_READ|PROT_WRITE,MAP_SHARED,stats->fd,0); @@ -158,7 +160,7 @@ static int stats_inc_counter(edg_wll_Context ctx,const edg_wll_JobStat *jobstat, edg_wll_ResetError(ctx); glite_common_log(LOG_CATEGORY_LB_SERVER, LOG_PRIORITY_DEBUG, - "inc_counter: destination %s, stats %d\n", + "inc_counter: destination %s, stats %d", jobstat->destination, (int) (stats - (edg_wll_Stats *) default_stats)); if (flock(stats->fd,LOCK_EX)) return edg_wll_SetError(ctx,errno,"flock()"); @@ -340,7 +342,8 @@ int edg_wll_StateRateServer( } if (i == stats->grpno) { - dprintf(("no match: %s\n",sig)); + glite_common_log(LOG_CATEGORY_LB_SERVER, LOG_PRIORITY_DEBUG, + "no match: %s\n",sig); edg_wll_SetError(ctx,ENOENT,"no matching group"); goto cleanup; } @@ -411,7 +414,7 @@ int edg_wll_StateRateServer( } glite_common_log(LOG_CATEGORY_LB_SERVER, LOG_PRIORITY_DEBUG, - "search %ld in %ld, %ld\n", *from, afrom, afrom+i); + "search %ld in %ld, %ld", *from, afrom, afrom+i); if (*from >= afrom && *from < afrom+i) { match += *from - afrom; diff --git a/org.glite.lb.server/src/store.c.T b/org.glite.lb.server/src/store.c.T index e77328b..b07e572 100644 --- a/org.glite.lb.server/src/store.c.T +++ b/org.glite.lb.server/src/store.c.T @@ -15,11 +15,11 @@ #include #include #include -#include #include #include "glite/jobid/strmd5.h" #include "glite/lbu/trio.h" +#include "glite/lbu/log.h" #include "glite/lb/events_parse.h" #include "glite/lb/context-int.h" @@ -85,6 +85,7 @@ int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,int } trio_asprintf(&stmt,"select userid from jobs where jobid='%|Ss'", jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,&sh) < 0 || edg_wll_FetchRow(ctx,sh,1,NULL,&userid) < 0) goto clean; if (sh) glite_lbu_FreeStmt(&sh); @@ -100,6 +101,7 @@ int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,int ssrc,e->any.host, stamp,e->any.timestamp.tv_usec, e->any.level,userid, e->any.seqcode); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,&sh) < 0) goto clean; nr = edg_wll_FetchRow(ctx,sh,1,NULL,&dummy); @@ -121,6 +123,7 @@ int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,int trio_asprintf(&stmt, "select nevents from jobs " "where jobid = '%|Ss'",jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,&sh) < 0 || edg_wll_FetchRow(ctx,sh,1,NULL,&max) < 0) goto clean; @@ -140,6 +143,7 @@ int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,int ssrc,e->any.host, stamp,e->any.timestamp.tv_usec, now_s, e->any.level,userid, e->any.seqcode); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) goto clean; free(stmt); stmt = NULL; @@ -148,6 +152,7 @@ int edg_wll_StoreEvent(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,int trio_asprintf(&stmt, "update jobs set nevents='%d'" "where jobid = '%|Ss'", next+1, jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) goto clean; free(stmt); stmt = NULL; @@ -174,6 +179,7 @@ static int store_user(edg_wll_Context ctx,const char *userid,const char *subj) trio_asprintf(&stmt,"insert into users(userid,cert_subj) " "values ('%|Ss','%|Ss')",userid,subj); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) { if (edg_wll_Error(ctx,NULL,NULL) == EEXIST) @@ -223,6 +229,7 @@ static int store_job(edg_wll_Context ctx,glite_jobid_const_t job,const char *use trio_asprintf(&stmt,"insert into jobs(jobid,dg_jobid,userid,proxy,server,grey) " "values ('%|Ss','%|Ss','%|Ss', '%|Sd', '%|Sd', '%|Sd')",jobid,jobstr,userid,proxy,server,grey); } + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) { if (edg_wll_Error(ctx,NULL,NULL) == EEXIST && !update) @@ -245,6 +252,8 @@ static int set_job_grey(edg_wll_Context ctx, char *jobid) char *stmt; trio_asprintf(&stmt,"update jobs set grey='1' where jobid='%|Ss'", jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + edg_wll_ExecSQL(ctx,stmt,NULL); free(stmt); @@ -286,6 +295,7 @@ int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *regis trio_asprintf(&q,"select proxy,server,grey from jobs where jobid='%|Ss' for update", unique); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, q); nar = edg_wll_ExecSQL(ctx,q,&stmt); free(q); q = NULL; @@ -348,6 +358,7 @@ int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *regis { trio_asprintf(&q,"select u.cert_subj from jobs j, users u " "where j.jobid='%|Ss' and u.userid=j.userid",unique); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, q); if (edg_wll_ExecSQL(ctx,q,&stmt) < 0 || edg_wll_FetchRow(ctx,stmt,1,NULL,&owner) < 0 @@ -364,6 +375,7 @@ int store_job_server_proxy(edg_wll_Context ctx, edg_wll_Event *event, int *regis if ( (!strcmp(res[0],"0") && ctx->isProxy) || (!strcmp(res[1],"0") && !ctx->isProxy) ) { trio_asprintf(&q,"update jobs set server='1', proxy='1' where jobid='%|Ss'", unique); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, q); if (edg_wll_ExecSQL(ctx,q,NULL) < 0) goto err; free(q); q = NULL; } @@ -456,6 +468,7 @@ static int store_flesh(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,char "values ('%|Ss',%d,'%|Ss','%|Ss')", strlen(f[i].val) <= SHORT_LEN ? "short_fields" : "long_fields", jobid,no,f[i].key,f[i].val); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) err = edg_wll_Error(ctx,NULL,NULL); free(stmt); @@ -467,12 +480,16 @@ static int store_flesh(edg_wll_Context ctx,edg_wll_Event *e,const char *ulm,char trio_asprintf(&stmt,"insert into short_fields(jobid,event,name,value) " "values ('%|Ss',%d,'SRC_INSTANCE','%|Ss')", jobid,no,e->any.src_instance); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) err = edg_wll_Error(ctx,NULL,NULL); free(stmt); } #else if (!ulm) ulm = edg_wll_UnparseEvent(ctx, e); trio_asprintf(&stmt, "insert into events_flesh (jobid, event, ulm) values ('%|Ss', %d, '%|Ss')", jobid, no, ulm); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + if (edg_wll_ExecSQL(ctx,stmt,NULL) < 0) err = edg_wll_Error(ctx,NULL,NULL); #endif @@ -560,6 +577,7 @@ static int check_auth(edg_wll_Context ctx,edg_wll_Event *e) trio_asprintf(&q,"select u.cert_subj from jobs j, users u " "where j.jobid='%|Ss' and u.userid=j.userid",jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, q); if (edg_wll_ExecSQL(ctx,q,&stmt) < 0 || edg_wll_FetchRow(ctx,stmt,1,NULL,&owner) < 0 @@ -692,6 +710,8 @@ int register_subjobs_embryonic(edg_wll_Context ctx,const edg_wll_RegJobEvent *e) /* get userid of parent job */ jobid = edg_wlc_JobIdGetUnique(e->jobId); trio_asprintf(&stmt,"select userid from jobs where jobid='%|Ss'", jobid); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + if (edg_wll_ExecSQL(ctx,stmt,&sh) < 0 || edg_wll_FetchRow(ctx,sh,1,NULL,&userid) < 0) goto err; for (i=0; insubjobs; i++) { @@ -721,8 +741,7 @@ int register_subjobs_embryonic(edg_wll_Context ctx,const edg_wll_RegJobEvent *e) if (err) { job_s = edg_wlc_JobIdUnparse(subjobs[i]); - fprintf(stderr,"%s: %s (%s)\n",job_s,et,ed); - syslog(LOG_ERR,"%s: %s (%s)",job_s,et,ed); + glite_common_log(LOG_CATEGORY_CONTROL, LOG_PRIORITY_ERROR, "%s: %s (%s)", job_s, et, ed); free(job_s); free(et); free(ed); edg_wll_ResetError(ctx); } @@ -757,24 +776,32 @@ int edg_wll_delete_event(edg_wll_Context ctx,const char *jobid,int event) trio_asprintf(&stmt, "delete from short_fields where jobid='%|Ss' and event=%d", jobid,event); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + edg_wll_ExecSQL(ctx,stmt,NULL); free(stmt); trio_asprintf(&stmt, "delete from long_fields where jobid='%|Ss' and event=%d", jobid,event); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + edg_wll_ExecSQL(ctx,stmt,NULL); free(stmt); trio_asprintf(&stmt, "delete from events_flesh where jobid='%|Ss' and event=%d", jobid,event); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + edg_wll_ExecSQL(ctx,stmt,NULL); free(stmt); trio_asprintf(&stmt, "delete from events where jobid='%|Ss' and event=%d", jobid,event); + glite_common_log(LOG_CATEGORY_LB_SERVER_DB, LOG_PRIORITY_DEBUG, stmt); + edg_wll_ExecSQL(ctx,stmt,NULL); free (stmt); diff --git a/org.glite.lb.server/src/stored_master.c b/org.glite.lb.server/src/stored_master.c index 71e7a58..884cbea 100644 --- a/org.glite.lb.server/src/stored_master.c +++ b/org.glite.lb.server/src/stored_master.c @@ -93,7 +93,7 @@ int edg_wll_StoreProtoServer(edg_wll_Context ctx) else #endif - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG,buf); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG,buf); handle_il_message(ctx,buf); free(buf); diff --git a/org.glite.lb.server/src/ws_lb4agu.c b/org.glite.lb.server/src/ws_lb4agu.c index 06b9282..33bf1b3 100644 --- a/org.glite.lb.server/src/ws_lb4agu.c +++ b/org.glite.lb.server/src/ws_lb4agu.c @@ -27,7 +27,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityStatus( edg_wll_JobStat s; int i,flags; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); if (!in) return SOAP_FAULT; @@ -52,7 +52,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityStatus( cjobid = edg_wlc_JobIdUnparse(j); cflags = edg_wll_stat_flags_to_string(flags); - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] \n\t%s\n\t%s\n", getpid(), cflags, cjobid); @@ -87,7 +87,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityInfo( edg_wll_JobStat s; int i,flags; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); if (!in) return SOAP_FAULT; @@ -112,9 +112,9 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb4agu__GetActivityInfo( cjobid = edg_wlc_JobIdUnparse(j); cflags = edg_wll_stat_flags_to_string(flags); - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, - "[%d] \n\t%s\n\t%s\n", + "[%d] \t%s\n\t%s", getpid(), cflags, cjobid); free(cjobid); free(cflags); diff --git a/org.glite.lb.server/src/ws_query.c b/org.glite.lb.server/src/ws_query.c index 64b0060..a3876c8 100644 --- a/org.glite.lb.server/src/ws_query.c +++ b/org.glite.lb.server/src/ws_query.c @@ -41,7 +41,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__GetVersion( struct _lbe__GetVersion *in, struct _lbe__GetVersionResponse *out) { - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); out->version = soap_strdup(soap, VERSION); @@ -61,7 +61,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__JobStatus( int flags; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); if ( edg_wlc_JobIdParse(in->jobid, &j) ) @@ -78,9 +78,9 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__JobStatus( cjobid = edg_wlc_JobIdUnparse(j); cflags = edg_wll_stat_flags_to_string(flags); - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, - "[%d] \n\t%s\n\t%s\n", + "[%d] \t%s\n\t%s", getpid(), cflags, cjobid); free(cjobid); free(cflags); @@ -112,7 +112,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__QueryJobs( int ret = SOAP_FAULT; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); out->states = soap_malloc(soap, sizeof(*out->states)); @@ -136,10 +136,10 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__QueryJobs( if (edg_wll_QueryJobsRequestToXML(ctx, (const edg_wll_QueryRec **) conditions, flags, &message)) { - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), "edg_wll_QueryJobsRequestToXML() returned error"); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), "edg_wll_QueryJobsRequestToXML() returned error"); } else { - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, "[%d] \n%s\n", getpid(), message); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), message); } free(message); } @@ -170,7 +170,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__UserJobs( edg_wll_JobStat *states; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); ctx = (edg_wll_Context) glite_gsplugin_get_udata(soap); @@ -204,7 +204,7 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__QueryEvents( int ret = SOAP_OK; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] WS call %s", getpid(), __FUNCTION__); edg_wll_ResetError(ctx); @@ -233,10 +233,10 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__QueryEvents( (const edg_wll_QueryRec **) job_conditions, (const edg_wll_QueryRec **) event_conditions, &message)) { - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), "edg_wll_QueryEventsRequestToXML() returned error"); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), "edg_wll_QueryEventsRequestToXML() returned error"); } else { - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, "[%d] \n%s\n", getpid(), message); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, "[%d] %s", getpid(), message); } free(message); } @@ -307,8 +307,8 @@ SOAP_FMAC5 int SOAP_FMAC6 __lb__NotifNew( edg_wll_NotifId nid = NULL; int ret = SOAP_OK; - glite_common_log(LOG_CATEGORY_LB_SERVER_ACCESS, LOG_PRIORITY_DEBUG, - "[%d] WS call %s\n", getpid(), __FUNCTION__); + glite_common_log(LOG_CATEGORY_LB_SERVER_REQUEST, LOG_PRIORITY_DEBUG, + "[%d] WS call %s", getpid(), __FUNCTION__); edg_wll_ResetError(ctx); if ( edg_wll_SoapToQueryCondsExt(in->conditions, in->__sizeconditions, &conditions) ) -- 1.8.2.3