treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

company-service: RequestHelper fix logger

Browse source
This commit is contained in:
akulikov 2023-04-07 11:17:16 +03:00
parent 3fcf40d94a
commit 4594540d40
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clearing-parent/company-service/src/main/java/ru/spcex/clearing/company/util/RequestHelper.java
View file

@ -1,6 +1,7 @@
package ru.spcex.clearing.company.util; package ru.spcex.clearing.company.util;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import ru.spcex.clearing.company.error.CompanyErrors; import ru.spcex.clearing.company.error.CompanyErrors;
import ru.spcex.clearing.platform.messaging.domain.BaseRequest; import ru.spcex.clearing.platform.messaging.domain.BaseRequest;
import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate; import ru.spcex.clearing.platform.messaging.service.RequestInfoUpdate;
@ -23,7 +24,7 @@ import java.util.Objects;
* .forDestination(Consts.DESTINATION_COMPANY_NEW, callbacks::put); * .forDestination(Consts.DESTINATION_COMPANY_NEW, callbacks::put);
*/ */
public class RequestHelper { public class RequestHelper {
protected Logger log = null; protected Logger log = LoggerFactory.getLogger(getClass());
protected final IMessageResolver messageResolver; protected final IMessageResolver messageResolver;
public RequestHelper(IMessageResolver messageResolver) { public RequestHelper(IMessageResolver messageResolver) {
@ -48,15 +49,12 @@ public class RequestHelper {
*/ */
public <X, T extends BaseRequest<X>> RequestInfoUpdate requestFunction(RequestCommand<T> command, T userRequest) { public <X, T extends BaseRequest<X>> RequestInfoUpdate requestFunction(RequestCommand<T> command, T userRequest) {
try { try {
if (log != null) log.debug("{} request received, BaseRequest.id = {}", userRequest.getClass().getSimpleName(), userRequest.getId());
log.debug("{} request received, BaseRequest.id = {}", userRequest.getClass().getSimpleName(), userRequest.getId());
RequestInfoUpdate reply = command.command(userRequest); RequestInfoUpdate reply = command.command(userRequest);
if (log != null) log.trace("Reply on request {}: {}" , userRequest.getId(), reply);
log.trace("Reply on request {}: {}" , userRequest.getId(), reply);
return reply; return reply;
} catch (ClearingBaseException expectedE) { } catch (ClearingBaseException expectedE) {
if (log != null) log.trace("{} return expected exception: {}", command, expectedE.toString());
log.trace("{} return expected exception: {}", command, expectedE.toString());
String message = expectedE.getEnumMsg() == null String message = expectedE.getEnumMsg() == null
? expectedE.getMessage() ? expectedE.getMessage()
: messageResolver.resolve(expectedE.getEnumMsg()); : messageResolver.resolve(expectedE.getEnumMsg());
@ -65,8 +63,7 @@ public class RequestHelper {
.setStatus(Status.Error) .setStatus(Status.Error)
.setMessage(message); .setMessage(message);
} catch (Exception unexpectedE) { } catch (Exception unexpectedE) {
if (log != null) log.error("Error at {}: {} ", command, ExceptionUtils.getStackTrace(unexpectedE));
log.error("Error at {}: {} ", command, ExceptionUtils.getStackTrace(unexpectedE));
String message = messageResolver.resolve(new EnumMessage(CompanyErrors.GeneralError)); String message = messageResolver.resolve(new EnumMessage(CompanyErrors.GeneralError));
return new RequestInfoUpdate() return new RequestInfoUpdate()
.setId(userRequest.getId()) .setId(userRequest.getId())
@ -93,6 +90,7 @@ public class RequestHelper {
} }
public RequestHelper setLogger(Logger log) { public RequestHelper setLogger(Logger log) {
if (log == null) return this;
this.log = log; this.log = log;
return this; return this;
} }