mirror of
https://github.com/Xahau/xahaud.git
synced 2025-12-06 17:27:52 +00:00
Remove Journal from most Stoppable overrides
This commit is contained in:
@@ -641,22 +641,22 @@ public:
|
||||
// Stoppable
|
||||
//
|
||||
|
||||
void onPrepare (Journal)
|
||||
void onPrepare ()
|
||||
{
|
||||
prepareValidators ();
|
||||
}
|
||||
|
||||
void onStart (Journal journal)
|
||||
void onStart ()
|
||||
{
|
||||
journal.debug << "Application starting";
|
||||
m_journal.debug << "Application starting";
|
||||
|
||||
m_sweepTimer.setExpiration (10);
|
||||
}
|
||||
|
||||
// Called to indicate shutdown.
|
||||
void onStop (Journal journal)
|
||||
void onStop ()
|
||||
{
|
||||
journal.debug << "Application stopping";
|
||||
m_journal.debug << "Application stopping";
|
||||
|
||||
m_sweepTimer.cancel();
|
||||
|
||||
@@ -679,8 +679,8 @@ public:
|
||||
// crash), the run() function will not get called and we will
|
||||
// avoid doing silly things like contacting the SNTP server, or
|
||||
// running the various logic threads like Validators, PeerFinder, etc.
|
||||
prepare (m_journal);
|
||||
start (m_journal);
|
||||
prepare ();
|
||||
start ();
|
||||
|
||||
|
||||
{
|
||||
|
||||
@@ -90,7 +90,7 @@ IoServicePool::operator boost::asio::io_service& ()
|
||||
return m_service;
|
||||
}
|
||||
|
||||
void IoServicePool::onStop (Journal)
|
||||
void IoServicePool::onStop ()
|
||||
{
|
||||
// VFALCO NOTE This is a hack! We should gracefully
|
||||
// cancel all pending I/O, and delete the work
|
||||
@@ -100,7 +100,7 @@ void IoServicePool::onStop (Journal)
|
||||
m_service.stop ();
|
||||
}
|
||||
|
||||
void IoServicePool::onChildrenStopped (Journal)
|
||||
void IoServicePool::onChildrenStopped ()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -31,8 +31,8 @@ public:
|
||||
boost::asio::io_service& getService ();
|
||||
operator boost::asio::io_service& ();
|
||||
|
||||
void onStop (Journal);
|
||||
void onChildrenStopped (Journal);
|
||||
void onStop ();
|
||||
void onChildrenStopped ();
|
||||
|
||||
private:
|
||||
class ServiceThread;
|
||||
|
||||
@@ -155,21 +155,21 @@ public:
|
||||
// Stoppable
|
||||
//
|
||||
|
||||
void onPrepare (Journal)
|
||||
void onPrepare ()
|
||||
{
|
||||
}
|
||||
|
||||
void onStart (Journal journal)
|
||||
void onStart ()
|
||||
{
|
||||
journal.debug << "Starting";
|
||||
m_journal.debug << "Starting";
|
||||
startThread ();
|
||||
}
|
||||
|
||||
void onStop (Journal journal)
|
||||
void onStop ()
|
||||
{
|
||||
if (isThreadRunning ())
|
||||
{
|
||||
journal.debug << "Stopping";
|
||||
m_journal.debug << "Stopping";
|
||||
stopThreadAsync ();
|
||||
}
|
||||
else
|
||||
|
||||
@@ -25,13 +25,13 @@ NodeStoreScheduler::NodeStoreScheduler (Stoppable& parent, JobQueue& jobQueue)
|
||||
{
|
||||
}
|
||||
|
||||
void NodeStoreScheduler::onStop (Journal)
|
||||
void NodeStoreScheduler::onStop ()
|
||||
{
|
||||
if (--m_taskCount == 0)
|
||||
stopped();
|
||||
}
|
||||
|
||||
void NodeStoreScheduler::onChildrenStopped (Journal)
|
||||
void NodeStoreScheduler::onChildrenStopped ()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
@@ -29,8 +29,8 @@ class NodeStoreScheduler
|
||||
public:
|
||||
NodeStoreScheduler (Stoppable& parent, JobQueue& jobQueue);
|
||||
|
||||
void onStop (Journal);
|
||||
void onChildrenStopped (Journal);
|
||||
void onStop ();
|
||||
void onChildrenStopped ();
|
||||
void scheduleTask (NodeStore::Task& task);
|
||||
|
||||
private:
|
||||
|
||||
@@ -92,12 +92,12 @@ public:
|
||||
// Stoppable
|
||||
//
|
||||
|
||||
void onStop (Journal)
|
||||
void onStop ()
|
||||
{
|
||||
m_server.stopAsync();
|
||||
}
|
||||
|
||||
void onChildrenStopped (Journal)
|
||||
void onChildrenStopped ()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user