[CH3478] Use the configured connection timeout (#92)

launchdarkly · May 18, 2017 · 8b40623 · 8b40623
1 parent c11b215
commit 8b40623
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Darkly/LDClientManager.m b/Darkly/LDClientManager.m
@@ -49,7 +49,7 @@ - (void)startPolling {
     [pollingMgr startEventPolling];
 
     if ([config streaming]) {
-        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] mobileKey:config.mobileKey];
+        eventSource = [EventSource eventSourceWithURL:[NSURL URLWithString:kStreamUrl] mobileKey:config.mobileKey timeoutInterval:[config.connectionTimeout doubleValue]];
 
         [eventSource onMessage:^(Event *e) {
             [self syncWithServerForConfig];

diff --git a/Darkly/LDRequestManager.m b/Darkly/LDRequestManager.m
@@ -53,6 +53,7 @@ -(void)performFeatureFlagRequest:(NSString *)encodedUser
             requestUrl = [requestUrl stringByAppendingString:encodedUser];
 
             NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:requestUrl]];
+            [request setTimeoutInterval:self.connectionTimeout];
 
             [self addFeatureRequestHeaders:request];
 
@@ -99,6 +100,7 @@ -(void)performEventRequest:(NSArray *)jsonEventArray
             NSString *requestUrl = [eventsUrl stringByAppendingString:kEventUrl];
 
             NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:requestUrl]];
+            [request setTimeoutInterval:self.connectionTimeout];
             [self addEventRequestHeaders:request];
 
             NSError *error;