SIGHUP now causes resync with peers.
This commit is contained in:
parent
aa1be9fcad
commit
d75f2f7051
3 changed files with 27 additions and 2 deletions
|
@ -224,6 +224,7 @@ struct _NodeImpl
|
|||
volatile Node::ReasonForTermination reasonForTermination;
|
||||
volatile bool started;
|
||||
volatile bool running;
|
||||
volatile bool resynchronize;
|
||||
|
||||
inline Node::ReasonForTermination terminate()
|
||||
{
|
||||
|
@ -359,6 +360,7 @@ Node::Node(const char *hp,unsigned int port,unsigned int controlPort)
|
|||
impl->reasonForTermination = Node::NODE_RUNNING;
|
||||
impl->started = false;
|
||||
impl->running = false;
|
||||
impl->resynchronize = false;
|
||||
}
|
||||
|
||||
Node::~Node()
|
||||
|
@ -528,7 +530,11 @@ Node::ReasonForTermination Node::run()
|
|||
}
|
||||
|
||||
uint64_t now = Utils::now();
|
||||
bool resynchronize = false;
|
||||
bool resynchronize = impl->resynchronize;
|
||||
if (resynchronize) {
|
||||
LOG("manual resynchronize ordered, resyncing with network");
|
||||
}
|
||||
impl->resynchronize = false;
|
||||
|
||||
// If it looks like the computer slept and woke, resynchronize.
|
||||
if (lastDelayDelta >= ZT_SLEEP_WAKE_DETECTION_THRESHOLD) {
|
||||
|
@ -657,6 +663,13 @@ void Node::terminate(ReasonForTermination reason,const char *reasonText)
|
|||
((_NodeImpl *)_impl)->renv.mainLoopWaitCondition.signal();
|
||||
}
|
||||
|
||||
void Node::resync()
|
||||
throw()
|
||||
{
|
||||
((_NodeImpl *)_impl)->resynchronize = true;
|
||||
((_NodeImpl *)_impl)->renv.mainLoopWaitCondition.signal();
|
||||
}
|
||||
|
||||
class _VersionStringMaker
|
||||
{
|
||||
public:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue