diff options
| author | Matt Corallo <[email protected]> | 2016-11-29 18:43:29 -0800 |
|---|---|---|
| committer | Matt Corallo <[email protected]> | 2016-12-24 11:10:39 -0500 |
| commit | 71fde5563b5d05a63e3ad08a3c32a9e5ffb952f7 (patch) | |
| tree | 2692245d7c49deb7196763b88b138320b23fe417 /src | |
| parent | Introduce (and use) an IsArgSet accessor method (diff) | |
| download | discoin-71fde5563b5d05a63e3ad08a3c32a9e5ffb952f7.tar.xz discoin-71fde5563b5d05a63e3ad08a3c32a9e5ffb952f7.zip | |
Get rid of mapArgs direct access in ZMQ construction
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 2 | ||||
| -rw-r--r-- | src/zmq/zmqnotificationinterface.cpp | 8 | ||||
| -rw-r--r-- | src/zmq/zmqnotificationinterface.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index 778d66fba..76ef08da3 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1282,7 +1282,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler) } #if ENABLE_ZMQ - pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs); + pzmqNotificationInterface = CZMQNotificationInterface::Create(); if (pzmqNotificationInterface) { RegisterValidationInterface(pzmqNotificationInterface); diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp index a7e20a835..2f5efcb4d 100644 --- a/src/zmq/zmqnotificationinterface.cpp +++ b/src/zmq/zmqnotificationinterface.cpp @@ -29,7 +29,7 @@ CZMQNotificationInterface::~CZMQNotificationInterface() } } -CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const std::map<std::string, std::string> &args) +CZMQNotificationInterface* CZMQNotificationInterface::Create() { CZMQNotificationInterface* notificationInterface = NULL; std::map<std::string, CZMQNotifierFactory> factories; @@ -42,11 +42,11 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const for (std::map<std::string, CZMQNotifierFactory>::const_iterator i=factories.begin(); i!=factories.end(); ++i) { - std::map<std::string, std::string>::const_iterator j = args.find("-zmq" + i->first); - if (j!=args.end()) + std::string arg("-zmq" + i->first); + if (IsArgSet(arg)) { CZMQNotifierFactory factory = i->second; - std::string address = j->second; + std::string address = GetArg(arg, ""); CZMQAbstractNotifier *notifier = factory(); notifier->SetType(i->first); notifier->SetAddress(address); diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h index 037470ec1..585554ccd 100644 --- a/src/zmq/zmqnotificationinterface.h +++ b/src/zmq/zmqnotificationinterface.h @@ -17,7 +17,7 @@ class CZMQNotificationInterface : public CValidationInterface public: virtual ~CZMQNotificationInterface(); - static CZMQNotificationInterface* CreateWithArguments(const std::map<std::string, std::string> &args); + static CZMQNotificationInterface* Create(); protected: bool Initialize(); |