Merge pull request #902 from couchbase/feature/issue_859

Expose tcp keep alive settings via Sync Gateway config
couchbase · Jun 4, 2015 · 21c7cb1 · 21c7cb1
2 parents d172464 + b69d6b4
commit 21c7cb1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/src/github.com/couchbase/go-couchbase b/src/github.com/couchbase/go-couchbase
diff --git a/src/github.com/couchbase/gomemcached b/src/github.com/couchbase/gomemcached
diff --git a/src/github.com/couchbase/sync_gateway/rest/config.go b/src/github.com/couchbase/sync_gateway/rest/config.go
@@ -66,6 +66,7 @@ type ServerConfig struct {
 	StatsReportInterval            *float64        // Optional stats report interval (0 to disable)
 	MaxCouchbaseConnections        *int            // Max # of sockets to open to a Couchbase Server node
 	MaxCouchbaseOverflow           *int            // Max # of overflow sockets to open
+	CouchbaseKeepaliveInterval     *int            // TCP keep-alive interval between SG and Couchbase server
 	SlowServerCallWarningThreshold *int            // Log warnings if database calls take this many ms
 	MaxIncomingConnections         *int            // Max # of incoming HTTP connections to accept
 	MaxFileDescriptors             *uint64         // Max # of open file descriptors (RLIMIT_NOFILE)

diff --git a/src/github.com/couchbase/sync_gateway/rest/server_context.go b/src/github.com/couchbase/sync_gateway/rest/server_context.go
@@ -65,6 +65,10 @@ func NewServerContext(config *ServerConfig) *ServerContext {
 		couchbase.PoolOverflow = *config.MaxCouchbaseOverflow
 	}
 
+	if config.CouchbaseKeepaliveInterval != nil {
+		couchbase.SetTcpKeepalive(true, *config.CouchbaseKeepaliveInterval)
+	}
+
 	slow := kDefaultSlowServerCallWarningThreshold
 	if config.SlowServerCallWarningThreshold != nil {
 		slow = *config.SlowServerCallWarningThreshold

diff --git a/sync_gateway.sublime-project b/sync_gateway.sublime-project
@@ -12,7 +12,7 @@
 				".*"
 			],
 			"follow_symlinks": true,
-			"path": "src/github.com/couchbaselabs/go-couchbase"
+			"path": "src/github.com/couchbase/go-couchbase"
 		},
 		{
 			"file_exclude_patterns":
+4 −1		cbdatasource/cbdatasource.go
+5 −0		conn_pool.go
+75 −0		examples/streaming/example.go
+30 −2		pools.go
+160 −0		streaming.go
+5 −0		upr.go
+53 −19		client/mc.go
+4 −0		client/upr_example/upr_example.go
+30 −17		client/upr_feed.go