Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Don't merge] Use private container to get database connection #1766

Merged
merged 2 commits into from Jul 25, 2018
Merged

[Don't merge] Use private container to get database connection #1766

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
919efd2
Use private container to get connection
t-ae Jul 21, 2018
4317a5f
use new DBKit API for poolContainer
tanner0101 Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions Sources/Vapor/Request/Request.swift
View file
Open in desktop
Expand Up @@ -170,7 +170,7 @@ public final class Request: ContainerAlias, DatabaseConnectable, HTTPMessageCont
return eventLoop.newFailedFuture(error: error)
}
hasActiveConnections = true
return requestCachedConnection(to: database)
return privateContainer.requestCachedConnection(to: database, poolContainer: self)
}

// MARK: Request Codable
Expand All @@ -188,7 +188,7 @@ public final class Request: ContainerAlias, DatabaseConnectable, HTTPMessageCont
/// Called when the `Request` deinitializes.
deinit {
if hasActiveConnections {
try! releaseCachedConnections()
try! privateContainer.releaseCachedConnections()
}
}
}