Updated a bit example

akbashev · akbashev · commit a6bc6c6230c7 · 2024-09-05T18:14:55.000+02:00
diff --git a/Samples/Package.swift b/Samples/Package.swift
@@ -1,19 +1,21 @@
-// swift-tools-version:5.0
+// swift-tools-version:6.0
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
+ 
+let globalSwiftSettings: [SwiftSetting] = [
+    .swiftLanguageMode(.v6)
+]
 
 var targets: [PackageDescription.Target] = [
-    .target(
+    .executableTarget(
         name: "SWIMNIOSampleCluster",
         dependencies: [
-            "SWIM",
-            "SWIMNIOExample",
-            "SwiftPrometheus",
-            "Lifecycle",
-            "ArgumentParser",
-        ],
-        path: "Sources/SWIMNIOSampleCluster"
+            .product(name: "SWIM", package: "swift-cluster-membership"),
+            .product(name: "SWIMNIOExample", package: "swift-cluster-membership"),
+            .product(name: "ServiceLifecycle", package: "swift-service-lifecycle"),
+            .product(name: "ArgumentParser", package: "swift-argument-parser"),
+        ]
     ),
 
     /* --- tests --- */
@@ -22,9 +24,8 @@ var targets: [PackageDescription.Target] = [
     .testTarget(
         name: "NoopTests",
         dependencies: [
-            "SWIM",
-        ],
-        path: "Tests/NoopTests"
+            .product(name: "SWIM", package: "swift-cluster-membership"),
+        ]
     ),
 ]
 
@@ -34,15 +35,14 @@ var dependencies: [Package.Dependency] = [
 
     // ~~~~~~~ only for samples ~~~~~~~
 
-    .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "1.0.0-alpha"),
-    .package(url: "https://github.com/MrLotU/SwiftPrometheus.git", from: "1.0.0-alpha"),
-    .package(url: "https://github.com/apple/swift-argument-parser", from: "0.2.0"),
+    .package(url: "https://github.com/swift-server/swift-service-lifecycle.git", from: "2.6.1"),
+    .package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
 ]
 
 let package = Package(
     name: "swift-cluster-membership-samples",
     platforms: [
-        .macOS(.v10_12)
+        .macOS(.v15),
     ],
     products: [
         .executable(
@@ -54,7 +54,14 @@ let package = Package(
 
     dependencies: dependencies,
 
-    targets: targets,
+    targets: targets.map { target in
+        var swiftSettings = target.swiftSettings ?? []
+        swiftSettings.append(contentsOf: globalSwiftSettings)
+        if !swiftSettings.isEmpty {
+            target.swiftSettings = swiftSettings
+        }
+        return target
+    },
 
     cxxLanguageStandard: .cxx11
 )
diff --git a/Samples/Sources/SWIMNIOSampleCluster/SWIMNIOSampleCluster.swift b/Samples/Sources/SWIMNIOSampleCluster/SWIMNIOSampleCluster.swift
@@ -15,33 +15,35 @@
 import ClusterMembership
 import SWIM
 import Metrics
-import Prometheus
 import SWIMNIOExample
 import NIO
 import Logging
-import Lifecycle
+import ServiceLifecycle
 import ArgumentParser
 
-struct SWIMNIOSampleCluster: ParsableCommand {
+@main
+struct SWIMNIOSampleCluster: AsyncParsableCommand {
+    
     @Option(name: .shortAndLong, help: "The number of nodes to start, defaults to: 1")
-    var count: Int?
+    var count: Int = 1
 
-    @Argument(help: "Hostname that node(s) should bind to")
-    var host: String?
+//    @Argument(help: "Hostname that node(s) should bind to")
+//    var host: String?
     
     @Option(help: "Determines which this node should bind to; Only effective when running a single node")
-    var port: Int?
+    var port: Int = 7001
 
     @Option(help: "Configures which nodes should be passed in as initial contact points, format: host:port,")
     var initialContactPoints: String = ""
 
     @Option(help: "Configures log level")
     var logLevel: String = "info"
 
-    mutating func run() throws {
+    func run() async throws {
         LoggingSystem.bootstrap(_SWIMPrettyMetadataLogHandler.init)
         let group = MultiThreadedEventLoopGroup(numberOfThreads: System.coreCount)
 
+        // FIXME: Update Prometheus client
         // Uncomment this if you'd like to see metrics displayed in the command line periodically;
         // This bootstraps and uses the Prometheus metrics backend to report metrics periodically by printing them to the stdout (console).
         //
@@ -58,51 +60,44 @@ struct SWIMNIOSampleCluster: ParsableCommand {
 //             }
 //        }
         
-        let lifecycle = ServiceLifecycle()
-        lifecycle.registerShutdown(
-            label: "eventLoopGroup",
-            .sync(group.syncShutdownGracefully)
-        )
-
+        var services: [any Service] = []
         var settings = SWIMNIO.Settings()
-        if count == nil || count == 1 {
-            let nodePort = self.port ?? 7001
+        if self.count == 1 {
+            let nodePort = self.port
             settings.logger = Logger(label: "swim-\(nodePort)")
             settings.logger.logLevel = self.parseLogLevel()
             settings.swim.logger.logLevel = self.parseLogLevel()
 
             settings.swim.initialContactPoints = self.parseContactPoints()
-
-            let node = SampleSWIMNIONode(port: nodePort, settings: settings, group: group)
-            lifecycle.register(
-                label: "swim-\(nodePort)",
-                start: .sync { node.start() },
-                shutdown: .sync {}
+            services.append(
+                SampleSWIMNIONode(
+                    port: nodePort,
+                    settings: settings,
+                    group: group
+                )
             )
-
         } else {
-            let basePort = port ?? 7001
-            for i in 1...(count ?? 1) {
+            let basePort = port
+            for i in 1...count {
                 let nodePort = basePort + i
 
                 settings.logger = Logger(label: "swim-\(nodePort)")
                 settings.swim.initialContactPoints = self.parseContactPoints()
 
-                let node = SampleSWIMNIONode(
-                    port: nodePort,
-                    settings: settings,
-                    group: group
-                )
-
-                lifecycle.register(
-                    label: "swim\(nodePort)",
-                    start: .sync { node.start() },
-                    shutdown: .sync {}
+                services.append(
+                    SampleSWIMNIONode(
+                        port: nodePort,
+                        settings: settings,
+                        group: group
+                    )
                 )
             }
         }
-        
-        try lifecycle.startAndWait()
+        let serviceGroup = ServiceGroup(
+            services: services,
+            logger: .init(label: "swim")
+        )
+        try await serviceGroup.run()
     }
 
     private func parseLogLevel() -> Logger.Level {
@@ -127,5 +122,3 @@ struct SWIMNIOSampleCluster: ParsableCommand {
         return Set(contactPoints)
     }
 }
-
-SWIMNIOSampleCluster.main()
diff --git a/Samples/Sources/SWIMNIOSampleCluster/SWIMNIOSampleNode.swift b/Samples/Sources/SWIMNIOSampleCluster/SWIMNIOSampleNode.swift
@@ -17,51 +17,57 @@ import SWIM
 import SWIMNIOExample
 import NIO
 import Logging
+import ServiceLifecycle
 
-struct SampleSWIMNIONode {
+struct SampleSWIMNIONode: Service {
+    
     let port: Int
     var settings: SWIMNIO.Settings
-
+    
     let group: EventLoopGroup
-
+    
     init(port: Int, settings: SWIMNIO.Settings, group: EventLoopGroup) {
         self.port = port
         self.settings = settings
         self.group = group
     }
-
-    func start() {
-        let bootstrap = DatagramBootstrap(group: group)
-            .channelOption(ChannelOptions.socketOption(.so_reuseaddr), value: 1)
-            .channelInitializer { channel in
-                return channel.pipeline
-                    .addHandler(SWIMNIOHandler(settings: self.settings)).flatMap {
-                        channel.pipeline.addHandler(SWIMNIOSampleHandler())
-                    }
-            }
-
-        bootstrap.bind(host: "127.0.0.1", port: port).whenComplete { result in
-            switch result {
-            case .success(let res):
-                self.settings.logger.info("Bound to: \(res)")
-                ()
-            case .failure(let error):
+    
+    func run() async throws {
+        try await withGracefulShutdownHandler {
+            let bootstrap = DatagramBootstrap(group: group)
+                .channelOption(ChannelOptions.socketOption(.so_reuseaddr), value: 1)
+                .channelInitializer { channel in
+                    return channel.pipeline
+                        .addHandler(SWIMNIOHandler(settings: self.settings)).flatMap {
+                            channel.pipeline.addHandler(SWIMNIOSampleHandler())
+                        }
+                }
+            
+            do {
+                let result = try await bootstrap.bind(host: "127.0.0.1", port: port).get()
+                self.settings.logger.info("Bound to: \(result)")
+            } catch {
                 self.settings.logger.error("Error: \(error)")
-                ()
+                throw error
             }
+            // FIXME: Should wait the app
+            try await Task.sleep(for: .seconds(100))
+        } onGracefulShutdown: {
+            try? self.group.syncShutdownGracefully()
         }
     }
-
+    
 }
 
 final class SWIMNIOSampleHandler: ChannelInboundHandler {
-    public typealias InboundIn = SWIM.MemberStatusChangedEvent
-
+    
+    typealias InboundIn = SWIM.MemberStatusChangedEvent<SWIM.NIOPeer>
+    
     let log = Logger(label: "SWIMNIOSample")
-
+    
     public func channelRead(context: ChannelHandlerContext, data: NIOAny) {
         let change: SWIM.MemberStatusChangedEvent = self.unwrapInboundIn(data)
-
+        
         // we log each event (in a pretty way)
         self.log.info("Membership status changed: [\(change.member.node)] is now [\(change.status)]", metadata: [
             "swim/member": "\(change.member.node)",
