@@ -3,17 +3,15 @@ import RxSwift
3
3
4
4
public final class HttpClient {
5
5
/// Scheduler for observing data task events
6
- internal let dataTaskScheduler =
7
- SerialDispatchQueueScheduler ( qos: . utility, internalSerialQueueName: " com.RxHttpClient.HttpClient.DataTask " )
6
+ internal let dataTaskScheduler = SerialDispatchQueueScheduler ( qos: . utility, internalSerialQueueName: " com.RxHttpClient.HttpClient.DataTask " )
8
7
/// Default concurrent scheduler for observing observable sequence created by loadStreamData method
9
- internal let streamDataObservingScheduler =
10
- SerialDispatchQueueScheduler ( qos: . utility, internalSerialQueueName: " com.RxHttpClient.HttpClient.Stream " )
8
+ internal let streamDataObservingScheduler = SerialDispatchQueueScheduler ( qos: . utility, internalSerialQueueName: " com.RxHttpClient.HttpClient.Stream " )
11
9
internal let sessionObserver = NSURLSessionDataEventsObserver ( )
12
10
internal let urlSession : URLSessionType
13
11
14
12
public let urlRequestCacheProvider : UrlRequestCacheProviderType ?
15
-
16
- public let requestPlugin : RequestPluginType ?
13
+
14
+ public let requestPlugin : RequestPluginType ?
17
15
18
16
/**
19
17
Creates an instance of HttpClient
@@ -53,7 +51,7 @@ extension HttpClient : HttpClientType {
53
51
// clears cache provider before start
54
52
dataCacheProvider? . clearData ( )
55
53
56
- let useRequest = object. requestPlugin? . prepare ( request: request) ?? request
54
+ let useRequest = object. requestPlugin? . prepare ( request: request) ?? request
57
55
58
56
let task = object. createStreamDataTask ( request: useRequest, dataCacheProvider: dataCacheProvider)
59
57
@@ -65,7 +63,7 @@ extension HttpClient : HttpClientType {
65
63
task. cancel ( )
66
64
disposable. dispose ( )
67
65
}
68
- } . observeOn ( streamDataObservingScheduler)
66
+ } . subscribeOn ( dataTaskScheduler ) . observeOn ( streamDataObservingScheduler)
69
67
}
70
68
71
69
public func createStreamDataTask( taskUid: String , request: URLRequest , dataCacheProvider: DataCacheProviderType ? ) -> StreamDataTaskType {
0 commit comments