Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ private static ServerResponse.BodyBuilder addHeaders(final ServerResponse.BodyBu
.varyBy(HttpHeaders.ACCEPT_ENCODING)
.cacheControl(CacheControl.noCache());

headers = applyHeaders(headers, request);
return headers;
return applyHeaders(headers, request);
}

private static ServerResponse.BodyBuilder applyHeaders(final ServerResponse.BodyBuilder builder,
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/org/prebid/cache/handlers/CacheHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.codahale.metrics.Timer;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.prebid.cache.exceptions.BadRequestException;
import org.prebid.cache.exceptions.DuplicateKeyException;
import org.prebid.cache.exceptions.PrebidException;
Expand Down Expand Up @@ -74,7 +75,8 @@ private Mono<ServerResponse> handleErrorMetrics(final Throwable error,
} else if (error instanceof TimeoutException) {
metricsRecorder.markMeterForTag(this.metricTagPrefix, MetricsRecorder.MeasurementTag.ERROR_TIMEDOUT);
} else {
log.error("Error occurred while processing the request", error);
log.error("Error occurred while processing the request: '{}', cause: '{}'",
ExceptionUtils.getMessage(error), ExceptionUtils.getMessage(error));
}

return builder.error(Mono.just(error), request)
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/prebid/cache/handlers/PostCacheHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import lombok.extern.slf4j.Slf4j;
import lombok.val;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.prebid.cache.builders.PrebidServerResponseBuilder;
import org.prebid.cache.exceptions.ExpiryOutOfRangeException;
import org.prebid.cache.exceptions.InvalidUUIDException;
Expand Down Expand Up @@ -184,7 +185,8 @@ private void sendRequestToSecondaryPrebidCacheHosts(List<PayloadWrapper> payload
.exchange()
.doOnError(throwable -> {
metricsRecorder.getSecondaryCacheWriteError().mark();
log.info("Failed to send request : ", throwable);
log.info("Failed to send request: '{}', cause: '{}'",
ExceptionUtils.getMessage(throwable), ExceptionUtils.getMessage(throwable));
})
.subscribe(clientResponse -> {
if (clientResponse.statusCode() != HttpStatus.OK) {
Expand All @@ -208,7 +210,8 @@ private Mono<RequestObject> getRequestBodyMono(final ServerRequest request) {
try {
requestObject = objectMapper.readValue(value, RequestObject.class);
} catch (IOException e) {
log.error("Exception occurred while deserialize request body", e);
log.error("Exception occurred while deserialize request body: '{}', cause: '{}'",
ExceptionUtils.getMessage(e), ExceptionUtils.getMessage(e));
}
return requestObject;
}).doOnError(throwable ->
Expand All @@ -217,6 +220,5 @@ private Mono<RequestObject> getRequestBodyMono(final ServerRequest request) {
}
return request.bodyToMono(RequestObject.class);
}

}

Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,7 @@ public static Host[] extractHosts(@NotNull String hostList) {
}

public static boolean isAerospikeCluster(@NotNull String hostList) {
if (hostList.split(",").length > 1) {
return true;
}
return false;
return hostList.split(",").length > 1;
}

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import com.aerospike.client.policy.WritePolicy;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.prebid.cache.exceptions.DuplicateKeyException;
import org.prebid.cache.exceptions.PayloadWrapperPropertyException;
import org.prebid.cache.exceptions.RepositoryException;
Expand Down Expand Up @@ -48,7 +49,7 @@ public class AerospikeRepositoryImpl implements ReactiveRepository<PayloadWrappe
private static final String BIN_NAME = "cache";

@Override
public Mono save(final PayloadWrapper wrapper) {
public Mono<PayloadWrapper> save(final PayloadWrapper wrapper) {
long expiry;
String normalizedId;
WritePolicy policy = writePolicy();
Expand All @@ -58,7 +59,8 @@ public Mono save(final PayloadWrapper wrapper) {
normalizedId = wrapper.getNormalizedId();
policy.expiration = (int) expiry;
} catch (PayloadWrapperPropertyException e) {
log.error("Exception occurred while extracting normalized id from payload", e);
log.error("Exception occurred while extracting normalized id from payload: '{}', cause: '{}'",
ExceptionUtils.getMessage(e), ExceptionUtils.getMessage(e));
return Mono.empty();
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import io.lettuce.core.api.reactive.RedisStringReactiveCommands;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.prebid.cache.exceptions.PayloadWrapperPropertyException;
import org.prebid.cache.exceptions.RepositoryException;
import org.prebid.cache.helpers.Json;
Expand All @@ -29,7 +30,8 @@ public Mono<PayloadWrapper> save(final PayloadWrapper wrapper) {
expiry = wrapper.getExpiry();
normalizedId = wrapper.getNormalizedId();
} catch (PayloadWrapperPropertyException e) {
log.error(e.getMessage(), e);
log.error("Exception occurred while getting payload wrapper property: '{}', cause: '{}'",
ExceptionUtils.getMessage(e), ExceptionUtils.getMessage(e));
return Mono.empty();
}

Expand Down