X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fclient.c;h=26d5fae89703169a56d4d4941ab82b480128eaec;hb=4737b4542db211d51cacefd36a3e24b568772a9e;hp=0f9e220b5d1712f53a53b461e784b8e8ffe3200c;hpb=4a2615d68317201c4662df95147bcc36cf1dd13f;p=pazpar2-moved-to-github.git diff --git a/src/client.c b/src/client.c index 0f9e220..26d5fae 100644 --- a/src/client.c +++ b/src/client.c @@ -439,8 +439,6 @@ void client_got_records(struct client *cl) void client_record_response(struct client *cl) { - static pthread_mutex_t ingest_mutex = PTHREAD_MUTEX_INITIALIZER; - static int ingest_counter = 0, ingest_max = 0; struct connection *co = cl->connection; ZOOM_connection link = connection_get_link(co); ZOOM_resultset resultset = cl->resultset; @@ -480,27 +478,18 @@ void client_record_response(struct client *cl) if (cl->session == 0) ; else if (ZOOM_record_error(rec, &msg, &addinfo, 0)) + { yaz_log(YLOG_WARN, "Record error %s (%s): %s (rec #%d)", - error, addinfo, client_get_url(cl), + msg, addinfo, client_get_url(cl), cl->record_offset); + } else { struct session_database *sdb = client_get_database(cl); NMEM nmem = nmem_create(); const char *xmlrec; - int new_max = 0; char type[80]; - yaz_log(YLOG_LOG, "Record ingest begin client=%p session=%p", cl, cl->session); - pthread_mutex_lock(&ingest_mutex); - ++ingest_counter; - if (ingest_counter > ingest_max) - { - ingest_max = ingest_counter; - new_max = ingest_max; - } - pthread_mutex_unlock(&ingest_mutex); - if (new_max) - yaz_log(YLOG_LOG, "New max client=%p new_max=%d", cl, new_max); + if (nativesyntax_to_type(sdb, type, rec)) yaz_log(YLOG_WARN, "Failed to determine record type"); xmlrec = ZOOM_record_get(rec, type, NULL); @@ -513,11 +502,7 @@ void client_record_response(struct client *cl) yaz_log(YLOG_WARN, "Failed to ingest from %s", client_get_url(cl)); } - pthread_mutex_lock(&ingest_mutex); - --ingest_counter; - pthread_mutex_unlock(&ingest_mutex); nmem_destroy(nmem); - yaz_log(YLOG_LOG, "Record ingest end client=%p session=%p max=%d", cl, cl->session, ingest_max); } } else