From 43c00d0a09734463c34ce067b3c5202dae14d8a9 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 12 Apr 2018 19:57:01 +0100 Subject: MockPool Add a constructor that just takes all properties in a simple form. Install the header. --- icetray/dryice/Jamfile.jam | 2 +- icetray/dryice/mockPool.cpp | 9 +++++++-- icetray/dryice/mockPool.h | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/icetray/dryice/Jamfile.jam b/icetray/dryice/Jamfile.jam index abf23d4..15d00fd 100644 --- a/icetray/dryice/Jamfile.jam +++ b/icetray/dryice/Jamfile.jam @@ -16,5 +16,5 @@ lib dryice : . ; -package.install install-dryice : . : : dryice : [ glob *.h : mockPool.h ] ; +package.install install-dryice : . : : dryice : [ glob *.h ] ; diff --git a/icetray/dryice/mockPool.cpp b/icetray/dryice/mockPool.cpp index ac73dad..11ccb75 100644 --- a/icetray/dryice/mockPool.cpp +++ b/icetray/dryice/mockPool.cpp @@ -4,9 +4,14 @@ namespace IceTray { MockPool::MockPool(const std::string & name, const std::string &, const Ice::PropertiesPtr & p) : - DB::BasicConnectionPool( + MockPool(name, p->getPropertyAsIntWithDefault(name + ".Database.PoolMax", 10), - p->getPropertyAsIntWithDefault(name + ".Database.PoolKeep", 2)), + p->getPropertyAsIntWithDefault(name + ".Database.PoolKeep", 2)) + { + } + + MockPool::MockPool(const std::string & name, int size, int keep) : + DB::BasicConnectionPool(size, keep), name(name) { } diff --git a/icetray/dryice/mockPool.h b/icetray/dryice/mockPool.h index 0e7b49b..1a7820e 100644 --- a/icetray/dryice/mockPool.h +++ b/icetray/dryice/mockPool.h @@ -6,9 +6,10 @@ #include namespace IceTray { - class MockPool : public DB::BasicConnectionPool { + class DLL_PUBLIC MockPool : public DB::BasicConnectionPool { public: MockPool(const std::string & name, const std::string &, const Ice::PropertiesPtr & p); + MockPool(const std::string & name, int size, int keep); DB::ConnectionPtr createResource() const override; -- cgit v1.2.3