From: Aleš Křenek <ljocha@ics.muni.cz>
Date: Fri, 27 Jun 2008 12:43:48 +0000 (+0000)
Subject: - handle QueryJobs errors in QueryEvents
X-Git-Tag: glite-lb-client_R_3_2_2_1~15
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=c0e1b90dfbd268fc5a1d6a65a792d4cba399433f;p=jra1mw.git

- handle QueryJobs errors in QueryEvents
- adapted unit test
---

diff --git a/org.glite.lb.server/src/query.c b/org.glite.lb.server/src/query.c
index 8ec4237..ffb2209 100644
--- a/org.glite.lb.server/src/query.c
+++ b/org.glite.lb.server/src/query.c
@@ -100,7 +100,7 @@ int edg_wll_QueryEventsServer(
 	i = 0;
 	out = calloc(1, sizeof(*out));
 
-	edg_wll_QueryJobsServer(ctx, job_conditions, 0, &jobsfound, &statesfound);
+	if (edg_wll_QueryJobsServer(ctx, job_conditions, 0, &jobsfound, &statesfound)) goto cleanup;
 
 	for ( ii = 0; (jobsfound) && (jobsfound[ii]); ii++ ) {
 		jobstr = edg_wlc_JobIdUnparse(jobsfound[ii]);
diff --git a/org.glite.lb.server/test/oneJob.qry b/org.glite.lb.server/test/oneJob.qry
index 9011124..59be576 100644
--- a/org.glite.lb.server/test/oneJob.qry
+++ b/org.glite.lb.server/test/oneJob.qry
@@ -26,3 +26,7 @@ select name,value from long_fields where jobid = 'WrCEKje9QTXFiSOZuPMLtw' and ev
 SELECT DISTINCT j.dg_jobid,j.userid FROM jobs j WHERE (j.jobid='WrCEKje9QTXFiSOZuPMLtw')
 https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw	294de3557d9d00b3d2d8a1e6aab028cf
 
+SELECT e.event,j.userid,j.dg_jobid,e.code,e.prog,e.host,u.cert_subj,e.time_stamp,e.usec,e.level,e.arrived FROM events e,users u,jobs j WHERE j.dg_jobid = 'https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw' AND e.jobid=j.jobid AND e.userid=u.userid AND e.code != 0 AND (j.jobid='WrCEKje9QTXFiSOZuPMLtw')
+0	294de3557d9d00b3d2d8a1e6aab028cf	https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw	17	UserInterface	lhun.ics.muni.cz	anonymous	2003-08-07 11:08:40	432100	8	2003-08-07 11:08:40
+1	294de3557d9d00b3d2d8a1e6aab028cf	https://lhun.ics.muni.cz:4850/WrCEKje9QTXFiSOZuPMLtw	2	NetworkServer	lhun.ics.muni.cz	anonymous	2003-08-07 11:09:05	664600	8	2003-08-07 11:09:05
+
diff --git a/org.glite.lb.server/test/test_query_events.cpp b/org.glite.lb.server/test/test_query_events.cpp
index 5bcea9a..b5d7982 100644
--- a/org.glite.lb.server/test/test_query_events.cpp
+++ b/org.glite.lb.server/test/test_query_events.cpp
@@ -152,6 +152,7 @@ int edg_wll_JobStatus(
 	int		flags,
 	edg_wll_JobStat	*stat)
 {
+	edg_wlc_JobIdDup(job,&stat->jobId);
 	return 0;
 }