sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1709 from strk/2.1.x-out_of_pool_slots

Browse source 
Fix postgresql connection leaks on error
This commit is contained in:
Dane Springmeyer 2013-04-02 11:11:21 -07:00
commit 88f8d9951c
2 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/input/postgis/connection.hpp
View file

@ -71,6 +71,7 @@ public:
} }
s << "\n" << connection_str; s << "\n" << connection_str;
PQfinish(conn_);
throw mapnik::datasource_exception(s.str()); throw mapnik::datasource_exception(s.str());
} }
} }
@ -152,7 +153,7 @@ public:
bool isOK() const bool isOK() const
{ {
return (PQstatus(conn_) != CONNECTION_BAD); return (!closed_) && (PQstatus(conn_) != CONNECTION_BAD);
} }
void close() void close()

41
plugins/input/postgis/postgis_datasource.cpp
View file

@ -127,11 +127,12 @@ void postgis_datasource::bind() const
if (pool) if (pool)
{ {
shared_ptr<Connection> conn = pool->borrowObject(); shared_ptr<Connection> conn = pool->borrowObject();
if (conn && conn->isOK()) if (!conn) return;
{
PoolGuard<shared_ptr<Connection>,
shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
PoolGuard<shared_ptr<Connection>,
shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
if (conn->isOK())
{
desc_.set_encoding(conn->client_encoding()); desc_.set_encoding(conn->client_encoding());
if (geometry_table_.empty()) if (geometry_table_.empty())
@ -435,6 +436,7 @@ postgis_datasource::~postgis_datasource()
if (conn) if (conn)
{ {
conn->close(); conn->close();
pool->returnObject(conn);
} }
} }
} }
@ -706,7 +708,17 @@ featureset_ptr postgis_datasource::features(const query& q) const
} }
else else
{ {
throw mapnik::datasource_exception("Postgis Plugin: bad connection"); std::string err_msg = "Postgis Plugin:";
if (conn)
{
err_msg += " Bad connection";
pool->returnObject(conn);
}
else
{
err_msg += " Null connection";
}
throw mapnik::datasource_exception(err_msg);
} }
} }
@ -729,10 +741,11 @@ featureset_ptr postgis_datasource::features_at_point(coord2d const& pt) const
if (pool) if (pool)
{ {
shared_ptr<Connection> conn = pool->borrowObject(); shared_ptr<Connection> conn = pool->borrowObject();
if (conn && conn->isOK()) if (!conn) return featureset_ptr();
{ PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
if (conn->isOK())
{
if (geometryColumn_.empty()) if (geometryColumn_.empty())
{ {
std::ostringstream s_error; std::ostringstream s_error;
@ -819,10 +832,10 @@ box2d<double> postgis_datasource::envelope() const
if (pool) if (pool)
{ {
shared_ptr<Connection> conn = pool->borrowObject(); shared_ptr<Connection> conn = pool->borrowObject();
if (conn && conn->isOK()) if (!conn) return extent_;
PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
if (conn->isOK())
{ {
PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
std::ostringstream s; std::ostringstream s;
boost::optional<mapnik::boolean> estimate_extent = boost::optional<mapnik::boolean> estimate_extent =
@ -920,10 +933,10 @@ boost::optional<mapnik::datasource::geometry_t> postgis_datasource::get_geometry
if (pool) if (pool)
{ {
shared_ptr<Connection> conn = pool->borrowObject(); shared_ptr<Connection> conn = pool->borrowObject();
if (conn && conn->isOK()) if (!conn) return result;
PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
if (conn->isOK())
{ {
PoolGuard<shared_ptr<Connection>, shared_ptr< Pool<Connection,ConnectionCreator> > > guard(conn, pool);
std::ostringstream s; std::ostringstream s;
std::string g_type; std::string g_type;