Skip to content

Commit 1548af8

Browse files
committed
feat: return error
1 parent bc55d9e commit 1548af8

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/main/java/com/topcoder/dal/DBAccessor.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.topcoder.dal.util.StreamJdbcTemplate;
88
import com.topcoder.dal.util.ParameterizedExpression;
99

10+
import io.grpc.Status;
1011
import io.grpc.stub.StreamObserver;
1112
import jdk.jshell.spi.ExecutionControl;
1213
import net.devh.boot.grpc.server.service.GrpcService;
@@ -327,10 +328,11 @@ public StreamObserver<QueryRequest> streamQuery(StreamObserver<QueryResponse> re
327328

328329
@Override
329330
public void onNext(QueryRequest request) {
330-
resetStreamTimeout();
331+
cancelStreamTimeout();
331332
try {
332333
QueryResponse response = executeQuery(request.getQuery(), con);
333334
responseObserver.onNext(response);
335+
resetStreamTimeout();
334336
} catch (Exception e) {
335337
rollback();
336338
cancelStreamTimeout();
@@ -387,7 +389,7 @@ private ScheduledFuture<?> scheduleStreamTimeout() {
387389
logger.error(message);
388390
rollback();
389391
cancelStreamTimeout();
390-
responseObserver.onCompleted();
392+
responseObserver.onError(Status.DEADLINE_EXCEEDED.withDescription(message).asRuntimeException());
391393
}, streamTimeout.plus(DEBOUNCE_INTERVAL).toNanos(), TimeUnit.NANOSECONDS);
392394
}
393395
};
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
spring.datasource.url=${DB_URL:jdbc:informix-sqli://localhost:2021/informixoltp:INFORMIXSERVER=informixoltp_tcp}
22
spring.datasource.username=${DB_USERNAME:informix}
33
spring.datasource.password=${DB_PASSWORD:1nf0rm1x}
4-
spring.datasource.hikari.connectionTimeout=20000
4+
spring.datasource.hikari.connectionTimeout=30000
55
spring.datasource.hikari.maximumPoolSize=20
6-
spring.datasource.hikari.leak-detection-threshold: 60000
6+
spring.datasource.hikari.leak-detection-threshold=90000
77
grpc.server.port=9090
88
logging.pattern.console=%d{yyyy-MM-dd HH:mm:ss.SSS} [%t] %X{AWS-XRAY-TRACE-ID} [%p] %M - %m%n

0 commit comments

Comments
 (0)