Changeset 5901 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java

Timestamp:

12/11/14 15:58:31 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha10: throttled client bug fix, more todos

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java (modified) (3 diffs)

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java

@@ -89 +89 @@
                 }
 
-                log.info("{} Start scan: {}", latch.get(), st.endpointUrl);
+                log.info("{} Start scan: {}#{}", latch.get(), st.endpointUrl, normalizeHandle(st.parentCorpus));
                 latch.increment();
                 sruClient.scan(scanRequest, st);
@@ -144 +144 @@
                                 }
 
-                                log.info("{} Finished scan: {}", latch.get(), endpointUrl);
+                                log.info("{} Finished scan: {}#{}", latch.get(), endpointUrl, normalizeHandle(parentCorpus));
                         } catch (Exception xc) {
-                                log.error("{} Exception in callback {}", latch.get(), endpointUrl);
+                                log.error("{} Exception in callback {}#{}", latch.get(), endpointUrl, normalizeHandle(parentCorpus));
                                 log.error("--> ", xc);
                         } finally {
@@ -155 +155 @@
                 @Override
                 public void onError(SRUScanRequest request, SRUClientException error, ThrottledClient.Stats stats) {
-                        latch.decrement();
-                        log.error("{} Error while scanning {}: {}", latch.get(), endpointUrl, error.getMessage());
-                        statistics.addEndpointDatapoint(institution, endpointUrl, stats.getQueueTime(), stats.getExecutionTime());
-                        statistics.addErrorDatapoint(institution, endpointUrl, error);
-                        if (Throw.isCausedBy(error, SocketTimeoutException.class)) {
-                                return;
-                        }
-                        log.error("--> " + request.getBaseURI() + "?" + request.getScanClause() + " --> ", error);
+                        try {
+                                log.error("{} Error while scanning {}#{}: {}", latch.get(), endpointUrl, normalizeHandle(parentCorpus), error.getMessage());
+                                statistics.addEndpointDatapoint(institution, endpointUrl, stats.getQueueTime(), stats.getExecutionTime());
+                                statistics.addErrorDatapoint(institution, endpointUrl, error);
+                                if (Throw.isCausedBy(error, SocketTimeoutException.class)) {
+                                        return;
+                                }
+                                log.error("--> " + request.getBaseURI() + "?" + request.getScanClause() + " --> ", error);
+                        } finally {
+                                latch.decrement();
+                        }
                 }
         }