Project

General

Profile

« Previous | Next » 

Revision 57867

#5185: Log formatting

View differences:

modules/dnet-modular-collector-service/trunk/src/main/java/eu/dnetlib/data/collector/plugins/HttpConnector.java
117 117
				if (is4xx(urlConn.getResponseCode())) {
118 118
					//CLIENT ERROR, DO NOT RETRY
119 119
					errorList.add(String.format("%s error %s: %s", requestUrl, urlConn.getResponseCode(), urlConn.getResponseMessage()));
120
					throw new CollectorServiceException("4xx error: request will not be repeated." + errorList);
120
					throw new CollectorServiceException("4xx error: request will not be repeated. " + errorList);
121 121
				}
122 122
				if (is5xx(urlConn.getResponseCode())) {
123 123
					//SERVER SIDE ERRORS RETRY ONLY on 503
124 124
					switch (urlConn.getResponseCode()) {
125 125
						case HttpURLConnection.HTTP_UNAVAILABLE:
126 126
							if (retryAfter > 0) {
127
								log.warn(requestUrl+" - waiting and repeating request after suggested retry-after" + retryAfter + " sec.");
127
								log.warn(requestUrl+" - waiting and repeating request after suggested retry-after " + retryAfter + " sec.");
128 128
								Thread.sleep(retryAfter * 1000);
129 129
							}
130 130
							else {
......
136 136
							return attemptDownload(requestUrl, retryNumber + 1, errorList);
137 137
						default:
138 138
							errorList.add(String.format("%s Error %s: %s", requestUrl, urlConn.getResponseCode(), urlConn.getResponseMessage()));
139
							throw new CollectorServiceException(urlConn.getResponseCode() + "error" + errorList);
139
							throw new CollectorServiceException(urlConn.getResponseCode() + " error " + errorList);
140 140
					}
141 141
				}
142
				throw new CollectorServiceException("Unexpected status code: " + urlConn.getResponseCode() + "error" + errorList);
142
				throw new CollectorServiceException(String.format("Unexpected status code: %s error %s", urlConn.getResponseCode(), errorList));
143 143
			}catch(MalformedURLException | NoRouteToHostException e){
144 144
				errorList.add(String.format("Error: %s for request url: %s", e.getCause(), requestUrl));
145 145
				throw new CollectorServiceException(e+ "error "+errorList);

Also available in: Unified diff