diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-12 19:57:01 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-12 20:10:35 +0100 |
| commit | 43c00d0a09734463c34ce067b3c5202dae14d8a9 (patch) | |
| tree | 5c7f6572592b84cba3af55654edec48b7b76b50c | |
| parent | C++17 and ICE 3.7 (diff) | |
| download | icetray-43c00d0a09734463c34ce067b3c5202dae14d8a9.tar.bz2 icetray-43c00d0a09734463c34ce067b3c5202dae14d8a9.tar.xz icetray-43c00d0a09734463c34ce067b3c5202dae14d8a9.zip | |
MockPool
Add a constructor that just takes all properties in a simple form.
Install the header.
| -rw-r--r-- | icetray/dryice/Jamfile.jam | 2 | ||||
| -rw-r--r-- | icetray/dryice/mockPool.cpp | 9 | ||||
| -rw-r--r-- | 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 : <include>. ; -package.install install-dryice : <install-source-root>. : : dryice : [ glob *.h : mockPool.h ] ; +package.install install-dryice : <install-source-root>. : : 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 <Ice/Properties.h> 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; |