Rename runOnEventLoop(channel:task:)

Kitura · Aug 30, 2018 · d9ba6e1 · d9ba6e1
1 parent 27e1158
commit d9ba6e1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Sources/KituraNet/ClientRequest.swift b/Sources/KituraNet/ClientRequest.swift
@@ -404,25 +404,25 @@ public class ClientRequest {
 
         // Make the HTTP request, the response callbacks will be received on the HTTPClientHandler.
         // We are mostly not running on the event loop. Let's make sure we send the request over the event loop.
-        runOnEventLoop(channel: channel) {
+        execute(on: channel.eventLoop) {
             self.sendRequest(request: request, on: self.channel)
         }
         waitSemaphore.wait()
 
         // We are now free to close the connection if asked for.
         if closeConnection {
-            runOnEventLoop(channel: channel) {
+            execute(on: channel.eventLoop) {
                 self.channel.close(promise: nil)
             }
         }
     }
 
     /// Executes task on event loop
-    private func runOnEventLoop(channel: Channel, _ task: @escaping () -> Void) {
-        if channel.eventLoop.inEventLoop {
+    private func execute(on eventLoop: EventLoop, _ task: @escaping () -> Void) {
+        if eventLoop.inEventLoop {
             task()
         } else {
-            channel.eventLoop.execute {
+            eventLoop.execute {
                 task()
             }
         }

diff --git a/Sources/KituraNet/HTTP/HTTPServerResponse.swift b/Sources/KituraNet/HTTP/HTTPServerResponse.swift
@@ -72,7 +72,7 @@ public class HTTPServerResponse: ServerResponse {
         }
 
         if buffer == nil {
-            runOnEventLoop(channel: channel) {
+            execute(on: channel.eventLoop) {
                 self.buffer = channel.allocator.buffer(capacity: string.utf8.count)
                 self.buffer!.write(string: string)
             }
@@ -88,19 +88,19 @@ public class HTTPServerResponse: ServerResponse {
         }
 
         if buffer == nil {
-            runOnEventLoop(channel: channel) {
+            execute(on: channel.eventLoop) {
                 self.buffer = channel.allocator.buffer(capacity: data.count)
                 self.buffer!.write(bytes: data)
             }
         }
     }
 
     /// Executes task on event loop
-    private func runOnEventLoop(channel: Channel, _ task: @escaping () -> Void) {
-        if channel.eventLoop.inEventLoop {
+    private func execute(on eventLoop: EventLoop, _ task: @escaping () -> Void) {
+        if eventLoop.inEventLoop {
             task()
         } else {
-            channel.eventLoop.execute {
+            eventLoop.execute {
                 task()
             }
         }
@@ -121,7 +121,7 @@ public class HTTPServerResponse: ServerResponse {
             fatalError("No channel available.")
         }
 
-        runOnEventLoop(channel: channel) {
+        execute(on: channel.eventLoop) {
             do {
                 try self.end0(channel: channel)
             } catch let error {
@@ -163,7 +163,7 @@ public class HTTPServerResponse: ServerResponse {
             fatalError("No channel available.")
         }
 
-        runOnEventLoop(channel: channel) {
+        execute(on: channel.eventLoop) {
             do {
                 try self.end0(with: errorCode, channel: channel, withBody: withBody)
             } catch let error {