Skip to content

Commit 3377e49

Browse files
committed
Removed loggin from bidirection invoker
1 parent f02e273 commit 3377e49

File tree

2 files changed

+14
-40
lines changed

2 files changed

+14
-40
lines changed

services-api/src/main/java/io/scalecube/services/methods/ServiceMethodInvoker.java

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -156,39 +156,12 @@ public Flux<ServiceMessage> invokeBidirectional(Publisher<ServiceMessage> publis
156156
.switchOnFirst(
157157
(first, messages) -> {
158158
final var message = first.get();
159-
final var request = toRequest(message);
160159
final var qualifier = message.qualifier();
161160
final var dataFormat = message.dataFormat();
162161

163162
return messages
164163
.map(this::toRequest)
165164
.transform(this::invokeRequest)
166-
.doOnSubscribe(
167-
s -> {
168-
if (logger != null && logger.isDebugEnabled()) {
169-
logger.debug(
170-
"[{}][subscribe] request: {}",
171-
message.qualifier(),
172-
toString(request));
173-
}
174-
})
175-
.doOnComplete(
176-
() -> {
177-
if (logger != null && logger.isDebugEnabled()) {
178-
logger.debug(
179-
"[{}][complete] request: {}", message.qualifier(), toString(request));
180-
}
181-
})
182-
.doOnError(
183-
ex -> {
184-
if (logger != null) {
185-
logger.error(
186-
"[{}][error] request: {}",
187-
message.qualifier(),
188-
toString(request),
189-
ex);
190-
}
191-
})
192165
.map(response -> toResponse(response, qualifier, dataFormat))
193166
.onErrorResume(ex -> Flux.just(errorMapper.toMessage(qualifier, ex)))
194167
.subscribeOn(methodInfo.scheduler());

services-transport-parent/services-transport-rsocket/src/main/java/io/scalecube/services/transport/rsocket/ServiceMessageCodec.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package io.scalecube.services.transport.rsocket;
22

3+
import static io.scalecube.services.transport.rsocket.ReferenceCountUtil.safestRelease;
34
import static java.util.function.Function.identity;
45
import static java.util.stream.Collectors.collectingAndThen;
56
import static java.util.stream.Collectors.toMap;
@@ -102,7 +103,7 @@ public <T> T encodeAndTransform(
102103
DataCodec dataCodec = getDataCodec(message.dataFormatOrDefault());
103104
dataCodec.encode(new ByteBufOutputStream(dataBuffer), message.data());
104105
} catch (Throwable ex) {
105-
ReferenceCountUtil.safestRelease(dataBuffer);
106+
safestRelease(dataBuffer);
106107
LOGGER.error(
107108
"Failed to encode service message data on: {}, cause: {}", message, ex.toString());
108109
throw new MessageCodecException("Failed to encode service message data", ex);
@@ -114,8 +115,8 @@ public <T> T encodeAndTransform(
114115
try {
115116
headersCodec.encode(new ByteBufOutputStream(headersBuffer), message.headers());
116117
} catch (Throwable ex) {
117-
ReferenceCountUtil.safestRelease(headersBuffer);
118-
ReferenceCountUtil.safestRelease(dataBuffer); // release data buf as well
118+
safestRelease(headersBuffer);
119+
safestRelease(dataBuffer); // release data buf as well
119120
LOGGER.error(
120121
"Failed to encode service message headers on: {}, cause: {}", message, ex.toString());
121122
throw new MessageCodecException("Failed to encode service message headers", ex);
@@ -144,7 +145,7 @@ public ServiceMessage decode(ByteBuf dataBuffer, ByteBuf headersBuffer)
144145
try (ByteBufInputStream stream = new ByteBufInputStream(headersBuffer, true)) {
145146
builder.headers(headersCodec.decode(stream));
146147
} catch (Throwable ex) {
147-
ReferenceCountUtil.safestRelease(dataBuffer); // release data buf as well
148+
safestRelease(dataBuffer); // release data buf as well
148149
throw new MessageCodecException("Failed to decode service message headers", ex);
149150
}
150151
}
@@ -163,12 +164,15 @@ public ServiceMessage decode(ByteBuf dataBuffer, ByteBuf headersBuffer)
163164
*/
164165
public static ServiceMessage decodeData(ServiceMessage message, Type dataType)
165166
throws MessageCodecException {
166-
if (dataType == null || !message.hasData(ByteBuf.class)) {
167+
if (dataType == null
168+
|| dataType == ByteBuf.class
169+
|| message.data() == null
170+
|| !(message.data() instanceof ByteBuf)) {
167171
return message;
168172
}
169173

170174
final ByteBuf dataBuffer = message.data();
171-
if (dataBuffer.readableBytes() == 0 || dataType == ByteBuf.class) {
175+
if (dataBuffer.readableBytes() == 0) {
172176
return message;
173177
}
174178
if (dataType == byte[].class) {
@@ -177,17 +181,14 @@ public static ServiceMessage decodeData(ServiceMessage message, Type dataType)
177181
return ServiceMessage.from(message).data(bytes).build();
178182
}
179183

180-
Object data;
181-
Type targetType = message.isError() ? ErrorData.class : dataType;
182-
183184
try (ByteBufInputStream inputStream = new ByteBufInputStream(dataBuffer, true)) {
184-
DataCodec dataCodec = DataCodec.getInstance(message.dataFormatOrDefault());
185-
data = dataCodec.decode(inputStream, targetType);
185+
final var targetType = message.isError() ? ErrorData.class : dataType;
186+
final var dataCodec = DataCodec.getInstance(message.dataFormatOrDefault());
187+
final var decodedData = dataCodec.decode(inputStream, targetType);
188+
return ServiceMessage.from(message).data(decodedData).build();
186189
} catch (Throwable ex) {
187190
throw new MessageCodecException("Failed to decode service message data", ex);
188191
}
189-
190-
return ServiceMessage.from(message).data(data).build();
191192
}
192193

193194
private DataCodec getDataCodec(String contentType) {

0 commit comments

Comments
 (0)