Skip to content

Commit 2bb0398

Browse files
authored
Cosmetic changes after PR#868 (#873)
1 parent 7b4ab0d commit 2bb0398

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

services-api/src/main/java/io/scalecube/services/ServiceCall.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,16 +212,14 @@ public Mono<ServiceMessage> requestOne(ServiceMessage request, Type responseType
212212
if (logger != null && logger.isLoggable(level)) {
213213
logger.log(
214214
level,
215-
"[{0}] request: {1}, response: {2}",
216-
request.qualifier(),
217-
request,
218-
response);
215+
"[{0}] request: " + request + ", response: " + response,
216+
request.qualifier());
219217
}
220218
})
221219
.doOnError(
222220
ex -> {
223221
if (logger != null) {
224-
logger.log(Level.ERROR, "[{0}] request: {1}", request.qualifier(), request, ex);
222+
logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex);
225223
}
226224
});
227225
}
@@ -266,13 +264,13 @@ public Flux<ServiceMessage> requestMany(ServiceMessage request, Type responseTyp
266264
.doOnSubscribe(
267265
s -> {
268266
if (logger != null && logger.isLoggable(level)) {
269-
logger.log(level, "[{0}] request: {1}", request.qualifier(), request);
267+
logger.log(level, "[{0}] request: " + request, request.qualifier());
270268
}
271269
})
272270
.doOnError(
273271
ex -> {
274272
if (logger != null) {
275-
logger.log(Level.ERROR, "[{0}] request: {1}", request.qualifier(), request, ex);
273+
logger.log(Level.ERROR, "[{0}] request: " + request, request.qualifier(), ex);
276274
}
277275
});
278276
}

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,16 +83,14 @@ private Mono<?> invokeOne(ServiceMessage message, Object authData) {
8383
if (logger != null && logger.isLoggable(level)) {
8484
logger.log(
8585
level,
86-
"[{0}] request: {1}, response: {2}",
87-
qualifier,
88-
request,
89-
response);
86+
"[{0}] request: " + request + ", response: " + response,
87+
qualifier);
9088
}
9189
})
9290
.doOnError(
9391
ex -> {
9492
if (logger != null) {
95-
logger.log(Level.ERROR, "[{0}] request: {1}", qualifier, request, ex);
93+
logger.log(Level.ERROR, "[{0}] request: " + request, qualifier, ex);
9694
}
9795
});
9896
})
@@ -124,13 +122,13 @@ private Flux<?> invokeMany(ServiceMessage message, Object authData) {
124122
.doOnSubscribe(
125123
s -> {
126124
if (logger != null && logger.isLoggable(level)) {
127-
logger.log(level, "[{0}] request: {1}", qualifier, request);
125+
logger.log(level, "[{0}] request: " + request, qualifier);
128126
}
129127
})
130128
.doOnError(
131129
ex -> {
132130
if (logger != null) {
133-
logger.log(Level.ERROR, "[{0}] request: {1}", qualifier, request, ex);
131+
logger.log(Level.ERROR, "[{0}] request: " + request, qualifier, ex);
134132
}
135133
});
136134
})

0 commit comments

Comments
 (0)