From a30520ee4953865df9b7b8c1745315b9f5d54898 Mon Sep 17 00:00:00 2001 From: Mathieu Barnachon Date: Mon, 12 Oct 2020 14:10:53 +0200 Subject: [PATCH 1/3] Add `connectionTimeout` from WebSocketService. This is required by the new version of the WebSocketService protocol. Also update dependencies to the community version of Kitura (moved away from IBM-Swift). --- Package.swift | 4 ++-- Sources/SwiftMetricsDash/SwiftMetricsDash.swift | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Package.swift b/Package.swift index 4985488..0e37025 100644 --- a/Package.swift +++ b/Package.swift @@ -21,9 +21,9 @@ import Foundation var webSocketPackage: Package.Dependency if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil { - webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket-NIO.git", from: "2.0.0") + webSocketPackage = .package(url: "https://github.com/Kitura/Kitura-WebSocket-NIO.git", from: "2.1.200") } else { - webSocketPackage = .package(url: "https://github.com/IBM-Swift/Kitura-WebSocket.git", from: "2.0.0") + webSocketPackage = .package(url: "https://github.com/Kitura/Kitura-WebSocket.git", from: "2.1.200") } let package = Package( diff --git a/Sources/SwiftMetricsDash/SwiftMetricsDash.swift b/Sources/SwiftMetricsDash/SwiftMetricsDash.swift index 0f70bdb..4efe3fc 100644 --- a/Sources/SwiftMetricsDash/SwiftMetricsDash.swift +++ b/Sources/SwiftMetricsDash/SwiftMetricsDash.swift @@ -79,6 +79,7 @@ public class SwiftMetricsDash { } class SwiftMetricsService: WebSocketService { + var connectionTimeout: Int? = nil private var connections = [String: WebSocketConnection]() var httpAggregateData: HTTPAggregateData = HTTPAggregateData() var httpURLData:[String:(totalTime:Double, numHits:Double, longestTime:Double)] = [:] From 397c5ba95921208f9b0777820e90dbcaf7b9b43b Mon Sep 17 00:00:00 2001 From: Mathieu Barnachon Date: Wed, 27 Oct 2021 11:51:36 +0200 Subject: [PATCH 2/3] Remove dedicated callback subscription. This allows a better generic approach. --- Sources/SwiftMetrics/SwiftMonitor.swift | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/SwiftMetrics/SwiftMonitor.swift b/Sources/SwiftMetrics/SwiftMonitor.swift index f416f0e..5e28e48 100644 --- a/Sources/SwiftMetrics/SwiftMonitor.swift +++ b/Sources/SwiftMetrics/SwiftMonitor.swift @@ -217,30 +217,30 @@ public class SwiftMonitor { } } - public func on(_ callback: @escaping cpuClosure) { - swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a CPUData observer") - EventEmitter.subscribe(callback: callback) - } - - public func on(_ callback: @escaping memoryClosure) { - swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a MemData observer") - EventEmitter.subscribe(callback: callback) - } - - public func on(_ callback: @escaping envClosure) { - swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an EnvData observer") - EventEmitter.subscribe(callback: callback) - } - - public func on(_ callback: @escaping initClosure) { - swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an InitData observer") - EventEmitter.subscribe(callback: callback) - } - - public func on(_ callback: @escaping latencyClosure) { - swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a LatencyData observer") - EventEmitter.subscribe(callback: callback) - } + // public func on(_ callback: @escaping cpuClosure) { + // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a CPUData observer") + // EventEmitter.subscribe(callback: callback) + // } + + // public func on(_ callback: @escaping memoryClosure) { + // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a MemData observer") + // EventEmitter.subscribe(callback: callback) + // } + + // public func on(_ callback: @escaping envClosure) { + // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an EnvData observer") + // EventEmitter.subscribe(callback: callback) + // } + + // public func on(_ callback: @escaping initClosure) { + // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an InitData observer") + // EventEmitter.subscribe(callback: callback) + // } + + // public func on(_ callback: @escaping latencyClosure) { + // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a LatencyData observer") + // EventEmitter.subscribe(callback: callback) + // } public func on(_ callback: @escaping (T) -> ()) { swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a \(T.self)) observer") From bfd2f5069098236853f325770cc12bff02bb9eb4 Mon Sep 17 00:00:00 2001 From: Mathieu Barnachon Date: Wed, 27 Oct 2021 12:01:14 +0200 Subject: [PATCH 3/3] Revert dedicated subscriptions --- Sources/SwiftMetrics/SwiftMonitor.swift | 48 ++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/Sources/SwiftMetrics/SwiftMonitor.swift b/Sources/SwiftMetrics/SwiftMonitor.swift index 5e28e48..f416f0e 100644 --- a/Sources/SwiftMetrics/SwiftMonitor.swift +++ b/Sources/SwiftMetrics/SwiftMonitor.swift @@ -217,30 +217,30 @@ public class SwiftMonitor { } } - // public func on(_ callback: @escaping cpuClosure) { - // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a CPUData observer") - // EventEmitter.subscribe(callback: callback) - // } - - // public func on(_ callback: @escaping memoryClosure) { - // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a MemData observer") - // EventEmitter.subscribe(callback: callback) - // } - - // public func on(_ callback: @escaping envClosure) { - // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an EnvData observer") - // EventEmitter.subscribe(callback: callback) - // } - - // public func on(_ callback: @escaping initClosure) { - // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an InitData observer") - // EventEmitter.subscribe(callback: callback) - // } - - // public func on(_ callback: @escaping latencyClosure) { - // swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a LatencyData observer") - // EventEmitter.subscribe(callback: callback) - // } + public func on(_ callback: @escaping cpuClosure) { + swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a CPUData observer") + EventEmitter.subscribe(callback: callback) + } + + public func on(_ callback: @escaping memoryClosure) { + swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a MemData observer") + EventEmitter.subscribe(callback: callback) + } + + public func on(_ callback: @escaping envClosure) { + swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an EnvData observer") + EventEmitter.subscribe(callback: callback) + } + + public func on(_ callback: @escaping initClosure) { + swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing an InitData observer") + EventEmitter.subscribe(callback: callback) + } + + public func on(_ callback: @escaping latencyClosure) { + swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a LatencyData observer") + EventEmitter.subscribe(callback: callback) + } public func on(_ callback: @escaping (T) -> ()) { swiftMetrics.loaderApi.logMessage(fine, "on(): Subscribing a \(T.self)) observer")