File tree 4 files changed +22
-14
lines changed
bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config
profiler/src/main/java/com/navercorp/pinpoint/profiler
4 files changed +22
-14
lines changed Original file line number Diff line number Diff line change @@ -26,15 +26,15 @@ public enum TransportModule {
26
26
27
27
public static TransportModule parse (String transportModule ) {
28
28
Objects .requireNonNull (transportModule , "transportModule" );
29
- if (isEquals (GRPC , transportModule )) {
29
+
30
+ if (equalsIgnoreCase (TransportModule .GRPC .name (), transportModule )) {
30
31
return GRPC ;
31
32
}
32
33
return GRPC ;
33
34
}
34
35
35
- private static boolean isEquals (TransportModule transportModule , String transportModuleString ) {
36
- final String transportModuleName = transportModule .name ();
37
- return transportModuleName .equalsIgnoreCase (transportModuleString );
36
+ private static boolean equalsIgnoreCase (String str1 , String str2 ) {
37
+ return str1 .equalsIgnoreCase (str2 );
38
38
}
39
39
40
40
public static TransportModule parse (String transportModule , TransportModule defaultModule ) {
Original file line number Diff line number Diff line change 16
16
17
17
package com .navercorp .pinpoint .profiler .receiver .grpc ;
18
18
19
- import java .util .Objects ;
20
19
import com .navercorp .pinpoint .grpc .StatusError ;
21
20
import com .navercorp .pinpoint .grpc .StatusErrors ;
22
21
import com .navercorp .pinpoint .grpc .client .SupportCommandCodeClientInterceptor ;
27
26
import com .navercorp .pinpoint .profiler .sender .grpc .ReconnectExecutor ;
28
27
import com .navercorp .pinpoint .profiler .sender .grpc .Reconnector ;
29
28
import com .navercorp .pinpoint .profiler .sender .grpc .StreamUtils ;
30
-
31
29
import io .grpc .stub .ClientCallStreamObserver ;
32
30
import io .grpc .stub .ClientResponseObserver ;
33
- import org .apache .logging .log4j .Logger ;
34
31
import org .apache .logging .log4j .LogManager ;
32
+ import org .apache .logging .log4j .Logger ;
33
+
34
+ import java .util .Objects ;
35
35
36
36
/**
37
37
* @author Taejin Koo
@@ -157,14 +157,14 @@ public void onError(Throwable t) {
157
157
@ Override
158
158
public void onCompleted () {
159
159
logger .info ("onCompleted" );
160
- StreamUtils .close (requestStream );
160
+ StreamUtils .close (requestStream , GrpcCommandService . this . logger );
161
161
// TODO : needs to check whether needs new action
162
162
reserveReconnect ();
163
163
}
164
164
165
165
private void stop () {
166
166
logger .info ("stop" );
167
- StreamUtils .close (requestStream );
167
+ StreamUtils .close (requestStream , GrpcCommandService . this . logger );
168
168
commandDispatcher .close ();
169
169
}
170
170
Original file line number Diff line number Diff line change 16
16
17
17
package com .navercorp .pinpoint .profiler .sender .grpc ;
18
18
19
- import java .util .Objects ;
20
19
import com .navercorp .pinpoint .grpc .MessageFormatUtils ;
21
20
import com .navercorp .pinpoint .grpc .StatusError ;
22
21
import com .navercorp .pinpoint .grpc .StatusErrors ;
25
24
import io .grpc .stub .ClientCallStreamObserver ;
26
25
import io .grpc .stub .ClientResponseObserver ;
27
26
import io .grpc .stub .StreamObserver ;
28
- import org .apache .logging .log4j .Logger ;
29
27
import org .apache .logging .log4j .LogManager ;
28
+ import org .apache .logging .log4j .Logger ;
30
29
30
+ import java .util .Objects ;
31
31
import java .util .concurrent .RejectedExecutionException ;
32
32
import java .util .concurrent .ScheduledExecutorService ;
33
33
import java .util .concurrent .ScheduledFuture ;
@@ -140,7 +140,7 @@ private ScheduledFuture<?> schedule(Runnable command) {
140
140
141
141
public void close () {
142
142
logger .info ("{} close()" , streamId );
143
- StreamUtils .close (this .requestObserver );
143
+ StreamUtils .close (this .requestObserver , this . logger );
144
144
}
145
145
146
146
@ Override
Original file line number Diff line number Diff line change 17
17
package com .navercorp .pinpoint .profiler .sender .grpc ;
18
18
19
19
import io .grpc .stub .StreamObserver ;
20
+ import org .apache .logging .log4j .Logger ;
21
+
20
22
21
23
/**
22
24
* @author Woonduk Kang(emeroad)
@@ -26,9 +28,15 @@ public final class StreamUtils {
26
28
private StreamUtils () {
27
29
}
28
30
29
- public static void close (final StreamObserver <?> streamObserver ) {
31
+ public static void close (final StreamObserver <?> streamObserver , Logger logger ) {
30
32
if (streamObserver != null ) {
31
- streamObserver .onCompleted ();
33
+ try {
34
+ streamObserver .onCompleted ();
35
+ } catch (Throwable th ) {
36
+ if (logger != null ) {
37
+ logger .info ("StreamObserver.onCompleted error" , th );
38
+ }
39
+ }
32
40
}
33
41
}
34
42
}
You can’t perform that action at this time.
0 commit comments