Skip to content

Commit 585855e

Browse files
committed
fix: unnecessary locks
1 parent 9338367 commit 585855e

File tree

2 files changed

+10
-32
lines changed

2 files changed

+10
-32
lines changed

Sources/UnleashProxyClientSwift/Metrics/Metrics.swift

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -136,32 +136,18 @@ public class Metrics {
136136
}
137137

138138
func createRequest(payload: Data) -> URLRequest {
139-
let urlValue: URL
140-
let clientKeyValue: String
141-
let appNameValue: String
142-
let connectionIdValue: UUID
143-
let customHeadersValue: [String: String]
144-
145-
lock.lock()
146-
urlValue = self.url
147-
clientKeyValue = self.clientKey
148-
appNameValue = self.appName
149-
connectionIdValue = self.connectionId
150-
customHeadersValue = self.customHeaders
151-
lock.unlock()
152-
153-
var request = URLRequest(url: urlValue.appendingPathComponent("client/metrics"))
139+
var request = URLRequest(url: url.appendingPathComponent("client/metrics"))
154140
request.httpMethod = "POST"
155141
request.httpBody = payload
156142
request.addValue("application/json", forHTTPHeaderField: "Accept")
157143
request.addValue("no-cache", forHTTPHeaderField: "Cache")
158144
request.addValue("application/json", forHTTPHeaderField: "Content-Type")
159-
request.addValue(clientKeyValue, forHTTPHeaderField: "Authorization")
160-
request.addValue(appNameValue, forHTTPHeaderField: "unleash-appname")
161-
request.addValue(connectionIdValue.uuidString, forHTTPHeaderField: "unleash-connection-id")
145+
request.addValue(clientKey, forHTTPHeaderField: "Authorization")
146+
request.addValue(appName, forHTTPHeaderField: "unleash-appname")
147+
request.addValue(connectionId.uuidString, forHTTPHeaderField: "unleash-connection-id")
162148
request.setValue("unleash-client-swift:\(LibraryInfo.version)", forHTTPHeaderField: "unleash-sdk")
163-
if !customHeadersValue.isEmpty {
164-
for (key, value) in customHeadersValue {
149+
if !customHeaders.isEmpty {
150+
for (key, value) in customHeaders {
165151
request.setValue(value, forHTTPHeaderField: key)
166152
}
167153
}

Sources/UnleashProxyClientSwift/Poller/Poller.swift

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,27 +140,19 @@ public class Poller {
140140
request.httpMethod = "GET"
141141
request.setValue("application/json", forHTTPHeaderField: "Content-Type")
142142

143-
let apiKeyValue: String
144143
let currentEtag: String
145-
let appNameValue: String
146-
let connectionIdValue: UUID
147-
let customHeadersValue: [String: String]
148144

149145
lock.lock()
150-
apiKeyValue = self.apiKey
151146
currentEtag = self.etag
152-
appNameValue = self.appName
153-
connectionIdValue = self.connectionId
154-
customHeadersValue = self.customHeaders
155147
lock.unlock()
156148

157-
request.setValue(apiKeyValue, forHTTPHeaderField: "Authorization")
149+
request.setValue(apiKey, forHTTPHeaderField: "Authorization")
158150
request.setValue(currentEtag, forHTTPHeaderField: "If-None-Match")
159-
request.setValue(appNameValue, forHTTPHeaderField: "unleash-appname")
160-
request.setValue(connectionIdValue.uuidString, forHTTPHeaderField: "unleash-connection-id")
151+
request.setValue(appName, forHTTPHeaderField: "unleash-appname")
152+
request.setValue(connectionId.uuidString, forHTTPHeaderField: "unleash-connection-id")
161153
request.setValue("unleash-client-swift:\(LibraryInfo.version)", forHTTPHeaderField: "unleash-sdk")
162154

163-
let customHeaders = customHeadersValue.merging(self.customHeadersProvider.getCustomHeaders()) { (_, new) in
155+
let customHeaders = self.customHeaders.merging(self.customHeadersProvider.getCustomHeaders()) { (_, new) in
164156
new
165157
}.filter { key, _ in !isSensitiveHeader(key) }
166158

0 commit comments

Comments
 (0)