Skip to content

Commit 6e320ff

Browse files
feat: rename DevCycleOptions.flushEventsIntervalMs to eventFlushIntervalMS
1 parent 777a317 commit 6e320ff

File tree

4 files changed

+23
-11
lines changed

4 files changed

+23
-11
lines changed

DevCycle/DevCycleClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public class DevCycleClient {
7575
internal func initialize(service: DevCycleServiceProtocol, callback: ClientInitializedHandler?) {
7676
if let options = self.options {
7777
Log.level = options.logLevel
78-
self.flushEventsInterval = Double(self.options?.flushEventsIntervalMs ?? self.defaultFlushInterval) / 1000.0
78+
self.flushEventsInterval = Double(self.options?.eventFlushIntervalMS ?? self.defaultFlushInterval) / 1000.0
7979
self.enableEdgeDB = options.enableEdgeDB
8080
self.disableAutomaticEventLogging = options.disableAutomaticEventLogging
8181
self.disableCustomEventLogging = options.disableCustomEventLogging

DevCycle/Models/DevCycleOptions.swift

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import Foundation
77

88
public class DevCycleOptions {
9-
var flushEventsIntervalMs: Int?
9+
var eventFlushIntervalMS: Int?
1010
var disableEventLogging: Bool?
1111
var logLevel: LogLevel = .error
1212
var enableEdgeDB: Bool = false
@@ -25,8 +25,14 @@ public class DevCycleOptions {
2525
}
2626

2727
// Controls the interval between flushing events to the DevCycle servers in milliseconds, defaults to 10 seconds.
28+
public func eventFlushIntervalMS(_ interval: Int? = 10000) -> OptionsBuilder {
29+
self.options.eventFlushIntervalMS = interval
30+
return self
31+
}
32+
33+
@available(*, deprecated, message: "Use eventFlushIntervalMS")
2834
public func flushEventsIntervalMs(_ interval: Int? = 10000) -> OptionsBuilder {
29-
self.options.flushEventsIntervalMs = interval
35+
self.options.eventFlushIntervalMS = interval
3036
return self
3137
}
3238

DevCycle/ObjC/ObjCDevCycleOptions.swift

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ public class ObjCLogLevel: NSObject {
1414

1515
@objc(DevCycleOptions)
1616
public class ObjCDevCycleOptions: NSObject {
17+
@available(*, deprecated, message: "Use eventFlushIntervalMS")
1718
@objc public var flushEventsIntervalMs: NSNumber?
19+
@objc public var eventFlushIntervalMS: NSNumber?
1820
@objc public var disableEventLogging: NSNumber?
1921
@objc public var logLevel: NSNumber?
2022
@objc public var enableEdgeDB: NSNumber?
@@ -27,9 +29,12 @@ public class ObjCDevCycleOptions: NSObject {
2729

2830
func buildDevCycleOptions() -> DevCycleOptions {
2931
var optionsBuilder = DevCycleOptions.builder()
30-
if let flushEventsIntervalMs = self.flushEventsIntervalMs,
31-
let interval = flushEventsIntervalMs as? Int {
32-
optionsBuilder = optionsBuilder.flushEventsIntervalMs(interval)
32+
if let eventFlushIntervalMS = self.eventFlushIntervalMS,
33+
let interval = eventFlushIntervalMS as? Int {
34+
optionsBuilder = optionsBuilder.eventFlushIntervalMS(interval)
35+
} else if let flushEventsIntervalMs = self.flushEventsIntervalMs,
36+
let interval = flushEventsIntervalMs as? Int {
37+
optionsBuilder = optionsBuilder.eventFlushIntervalMS(interval)
3338
}
3439

3540
if let disableEventLogging = self.disableEventLogging,

DevCycleTests/Models/DevCycleOptionsTest.swift

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ class DevCycleOptionsTest: XCTestCase {
1010
func testOptionsAreNil() {
1111
let options = DevCycleOptions()
1212
XCTAssertNil(options.disableEventLogging)
13-
XCTAssertNil(options.flushEventsIntervalMs)
13+
XCTAssertNil(options.eventFlushIntervalMS)
1414
}
1515

1616
func testBuilderReturnsOptions() {
1717
let options = DevCycleOptions.builder()
1818
.disableEventLogging(false)
19-
.flushEventsIntervalMs(1000)
19+
.eventFlushIntervalMS(1000)
2020
.enableEdgeDB(true)
2121
.configCacheTTL(172800000)
2222
.disableConfigCache(true)
@@ -26,7 +26,7 @@ class DevCycleOptionsTest: XCTestCase {
2626
.apiProxyURL("localhost:4000")
2727
.build()
2828
XCTAssertNotNil(options)
29-
XCTAssert(options.flushEventsIntervalMs == 1000)
29+
XCTAssert(options.eventFlushIntervalMS == 1000)
3030
XCTAssertFalse(options.disableEventLogging!)
3131
XCTAssert(options.enableEdgeDB)
3232
XCTAssert(options.configCacheTTL == 172800000)
@@ -42,7 +42,7 @@ class DevCycleOptionsTest: XCTestCase {
4242
.disableEventLogging(false)
4343
.build()
4444
XCTAssertNotNil(options)
45-
XCTAssertNil(options.flushEventsIntervalMs)
45+
XCTAssertNil(options.eventFlushIntervalMS)
4646
XCTAssertFalse(options.disableEventLogging!)
4747
XCTAssertFalse(options.enableEdgeDB)
4848
XCTAssertFalse(options.disableRealtimeUpdates)
@@ -51,9 +51,10 @@ class DevCycleOptionsTest: XCTestCase {
5151
func testDeprecatedDVCOptions() {
5252
let options = DVCOptions.builder()
5353
.disableEventLogging(false)
54+
.flushEventsIntervalMs(2000)
5455
.build()
5556
XCTAssertNotNil(options)
56-
XCTAssertNil(options.flushEventsIntervalMs)
57+
XCTAssert(options.eventFlushIntervalMS == 2000)
5758
XCTAssertFalse(options.disableEventLogging!)
5859
XCTAssertFalse(options.enableEdgeDB)
5960
XCTAssertFalse(options.disableRealtimeUpdates)

0 commit comments

Comments
 (0)