Merge branch 'development' into swift3

* development:
  change travis config
  remove log for dorequest
This commit is contained in:
Erik Little 2016-07-21 10:44:11 -04:00
commit 3500211eed
No known key found for this signature in database
GPG Key ID: 62F837E56F4E9320
2 changed files with 4 additions and 8 deletions

View File

@ -5,12 +5,9 @@ branches:
xcode_project: Socket.IO-Client-Swift.xcodeproj # path to your xcodeproj folder
xcode_scheme: SocketIO-iOS
osx_image: xcode7.3
before_install:
- cd Socket.IO-Test-Server/
- npm install
- cd ..
branches:
only:
- master
- development
install: node Socket.IO-Test-Server/main.js &
script: xctool -project Socket.IO-Client-Swift.xcodeproj -scheme SocketIO-Mac build test -parallelize
cache:
directories:
- Socket.IO-Test-Server/node_modules

View File

@ -102,7 +102,6 @@ extension SocketEnginePollable {
func doRequest(for req: URLRequest, callbackWith callback: (Data?, URLResponse?, NSError?) -> Void) {
if !polling || closed || invalidated || fastUpgrade {
DefaultSocketLogger.Logger.error("Tried to do polling request when not supposed to", type: "SocketEnginePolling")
return
}