Allow users to switch to using the NIO port of KituraNet #1324
Conversation
pushkarnk
force-pushed
the
dual-switch-2
branch
from
9943bd3
to
a32b6a0
Compare
pushkarnk
changed the title
pushkarnk
force-pushed
the
dual-switch-2
branch
from
8c5d79e
to
9c70118
Compare
|
I added CI runs with KITURA_NIO=1 on trusty, xenial(docker) and osx to the travis.yml. And we've hit the linker error. |
|
I've removed CI builds on Ubuntu 16.04 while we try to address the linker error which has started to look like an Ubuntu thing. |
| env: SWIFT_SNAPSHOT=4.2 KITURA_NIO=1 | ||
|
|
||
| before_install: | ||
| - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install libressl ; fi |
There was a problem hiding this comment.
I guess this is going to be required for all Kitura packages on macOS? If so, perhaps it would be better added to Package-Builder.
Package.swift
Outdated
| var kituraNetPackage: Package.Dependency | ||
|
|
||
| if let _ = ProcessInfo.processInfo.environment["KITURA_NIO"] { | ||
| kituraNetPackage = .package(url: "https://github.com/IBM-Swift/Kitura-NIO.git", from: "1.0.0") |
There was a problem hiding this comment.
I wonder if there is a case for tagging Kitura-NIO to 2.0.0, just to keep things closer in sync?
There was a problem hiding this comment.
Sure, I think that's a good idea
There was a problem hiding this comment.
any comments on that @djones6 ?
Package.swift
Outdated
|
|
||
| var kituraNetPackage: Package.Dependency | ||
|
|
||
| if let _ = ProcessInfo.processInfo.environment["KITURA_NIO"] { |
There was a problem hiding this comment.
I think I prefer if ProcessInfo.processInfo.environment["KITURA_NIO"] != nil like you did in the tests.
pushkarnk
force-pushed
the
dual-switch-2
branch
4 times, most recently
from
01544d9
to
bc8952a
Compare
We recently renamed the erstwhile KituraNIO package to KituraNet. So, we now have a
KituraNetand aSwiftNIO-based KituraNet. This pull request allows Kitura users to switch to using the latter using only an environment variable namedKITURA_NIO.Description
The core of the change is only to the Swift package manifest file. In the building phase of the Kitura application, if an environment variable named
KITURA_NIOis set, the Swift package manager switches to using the NIO-based KituraNet found here. The other changes in this pull request are in the Tests and mostly around two limitations of the NIO-based port - a bind issue and the absence of a FastCGI implementation.To enable the use of the
SwiftNIO-based KituraNetwe use:export KITURA_NIO=1To switch back to using stock KituraNet in the same environment:
unset KITURA_NIOMotivation and Context
Support for a NIO-based networking package was available until now only on a branch named
kitura-nio. This pull request makes it available on the master branch.