Skip to content

Commit bb67b4f

Browse files
author
hideki
committed
Fixed #1339 - Make lower initial heartbeat value for /_changes REST API
- Sync Gateway's minimum value of heartbeat is 25 sec. From sync gateway point of view, any number higher than 25 sec is acceptable. Set default heartbeat value to 30 sec. and set default socket read time out to 40 sec which is 30 sec + 10 sec (extra).
1 parent d664a43 commit bb67b4f

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

src/main/java/com/couchbase/lite/replicator/Replication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public enum Lifecycle {
6868
*/
6969
public static final String REPLICATOR_DATABASE_NAME = "_replicator";
7070
public static long DEFAULT_MAX_TIMEOUT_FOR_SHUTDOWN = 60; // 60 sec
71-
public static int DEFAULT_HEARTBEAT = 300; // 5min (300 sec)
71+
public static int DEFAULT_HEARTBEAT = 30; // 30 sec (till v1.2.0 and iOS uses 5min)
7272

7373
/**
7474
* Options for what metadata to include in document bodies

src/main/java/com/couchbase/lite/support/CouchbaseLiteHttpClientFactory.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,12 @@ public class CouchbaseLiteHttpClientFactory implements HttpClientFactory {
3939
private boolean followRedirects = true;
4040

4141
// deprecated
42-
public static int DEFAULT_SO_TIMEOUT_SECONDS = 60 * 5;
42+
public static int DEFAULT_SO_TIMEOUT_SECONDS = 40; // 40 sec (previously it was 5 min)
43+
// heartbeat value 30sec + 10 sec
4344

4445
// OkHttp Default Timeout is 10 sec for all timeout settings
4546
public static int DEFAULT_CONNECTION_TIMEOUT_SECONDS = 10;
46-
public static int DEFAULT_READ_TIMEOUT = DEFAULT_SO_TIMEOUT_SECONDS;
47+
public static int DEFAULT_READ_TIMEOUT = DEFAULT_SO_TIMEOUT_SECONDS;
4748
public static int DEFAULT_WRITE_TIMEOUT = 10;
4849

4950
/**

0 commit comments

Comments
 (0)