Fix ZMQ Notification initialization and shutdown

João Barbosa · João Barbosa · commit de0499d3b835 · 2015-11-04T10:36:00.000Z
Moves the call Initialize() from init.cpp to CreateWithArguments() and handles the
return value. Moves the call Shutdown() from init.cpp to destructor.
Changes Initialize() and Shutdown() to protected members.
diff --git a/src/init.cpp b/src/init.cpp
@@ -222,7 +222,6 @@ void Shutdown()
 #if ENABLE_ZMQ
     if (pzmqNotificationInterface) {
         UnregisterValidationInterface(pzmqNotificationInterface);
-        pzmqNotificationInterface->Shutdown();
         delete pzmqNotificationInterface;
         pzmqNotificationInterface = NULL;
     }
@@ -1176,7 +1175,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
     pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);
 
     if (pzmqNotificationInterface) {
-        pzmqNotificationInterface->Initialize();
         RegisterValidationInterface(pzmqNotificationInterface);
     }
 #endif
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
@@ -21,8 +21,7 @@ CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(NULL)
 
 CZMQNotificationInterface::~CZMQNotificationInterface()
 {
-    // ensure Shutdown if Initialize is called
-    assert(!pcontext);
+    Shutdown();
 
     for (std::list<CZMQAbstractNotifier*>::iterator i=notifiers.begin(); i!=notifiers.end(); ++i)
     {
@@ -59,6 +58,12 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const
     {
         notificationInterface = new CZMQNotificationInterface();
         notificationInterface->notifiers = notifiers;
+
+        if (!notificationInterface->Initialize())
+        {
+            delete notificationInterface;
+            notificationInterface = NULL;
+        }
     }
 
     return notificationInterface;
@@ -99,7 +104,7 @@ bool CZMQNotificationInterface::Initialize()
         return false;
     }
 
-    return false;
+    return true;
 }
 
 // Called during shutdown sequence
diff --git a/src/zmq/zmqnotificationinterface.h b/src/zmq/zmqnotificationinterface.h
@@ -19,10 +19,11 @@ class CZMQNotificationInterface : public CValidationInterface
 
     static CZMQNotificationInterface* CreateWithArguments(const std::map<std::string, std::string> &args);
 
+protected:
     bool Initialize();
     void Shutdown();
 
-protected: // CValidationInterface
+    // CValidationInterface
     void SyncTransaction(const CTransaction &tx, const CBlock *pblock);
     void UpdatedBlockTip(const CBlockIndex *pindex);
 

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,6 @@ void Shutdown()`
`222`	`222`	`#if ENABLE_ZMQ`
`223`	`223`	`if (pzmqNotificationInterface) {`
`224`	`224`	`UnregisterValidationInterface(pzmqNotificationInterface);`
`225`		`- pzmqNotificationInterface->Shutdown();`
`226`	`225`	`delete pzmqNotificationInterface;`
`227`	`226`	`pzmqNotificationInterface = NULL;`
`228`	`227`	`}`
`@@ -1176,7 +1175,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)`
`1176`	`1175`	`pzmqNotificationInterface = CZMQNotificationInterface::CreateWithArguments(mapArgs);`
`1177`	`1176`
`1178`	`1177`	`if (pzmqNotificationInterface) {`
`1179`		`- pzmqNotificationInterface->Initialize();`
`1180`	`1178`	`RegisterValidationInterface(pzmqNotificationInterface);`
`1181`	`1179`	`}`
`1182`	`1180`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,7 @@ CZMQNotificationInterface::CZMQNotificationInterface() : pcontext(NULL)`
`21`	`21`
`22`	`22`	`CZMQNotificationInterface::~CZMQNotificationInterface()`
`23`	`23`	`{`
`24`		`- // ensure Shutdown if Initialize is called`
`25`		`- assert(!pcontext);`
	`24`	`+ Shutdown();`
`26`	`25`
`27`	`26`	`for (std::list<CZMQAbstractNotifier*>::iterator i=notifiers.begin(); i!=notifiers.end(); ++i)`
`28`	`27`	`{`
`@@ -59,6 +58,12 @@ CZMQNotificationInterface* CZMQNotificationInterface::CreateWithArguments(const`
`59`	`58`	`{`
`60`	`59`	`notificationInterface = new CZMQNotificationInterface();`
`61`	`60`	`notificationInterface->notifiers = notifiers;`
	`61`	`+`
	`62`	`+ if (!notificationInterface->Initialize())`
	`63`	`+ {`
	`64`	`+ delete notificationInterface;`
	`65`	`+ notificationInterface = NULL;`
	`66`	`+ }`
`62`	`67`	`}`
`63`	`68`
`64`	`69`	`return notificationInterface;`
`@@ -99,7 +104,7 @@ bool CZMQNotificationInterface::Initialize()`
`99`	`104`	`return false;`
`100`	`105`	`}`
`101`	`106`
`102`		`- return false;`
	`107`	`+ return true;`
`103`	`108`	`}`
`104`	`109`
`105`	`110`	`// Called during shutdown sequence`