Mercurial > hg > orthanc
comparison OrthancServer/main.cpp @ 1223:5bd4c9f85b4c
fix race condition while unregistering plugins
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 12 Nov 2014 11:52:40 +0100 |
parents | 178de5edc0a8 |
children | f1c01451a8ee |
comparison
equal
deleted
inserted
replaced
1222:410c27e04a23 | 1223:5bd4c9f85b4c |
---|---|
584 | 584 |
585 // We're done | 585 // We're done |
586 LOG(WARNING) << "Orthanc is stopping"; | 586 LOG(WARNING) << "Orthanc is stopping"; |
587 | 587 |
588 #if ENABLE_PLUGINS == 1 | 588 #if ENABLE_PLUGINS == 1 |
589 context.ResetOrthancPlugins(); | |
589 orthancPlugins.Stop(); | 590 orthancPlugins.Stop(); |
590 LOG(WARNING) << " Plugins have stopped"; | 591 LOG(WARNING) << " Plugins have stopped"; |
591 #endif | 592 #endif |
592 | 593 |
593 dicomServer.Stop(); | 594 dicomServer.Stop(); |
699 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "]"; | 700 LOG(ERROR) << "Uncaught exception, stopping now: [" << e.What() << "]"; |
700 status = -1; | 701 status = -1; |
701 } | 702 } |
702 catch (...) | 703 catch (...) |
703 { | 704 { |
704 LOG(ERROR) << "Native exception, stopping now"; | 705 LOG(ERROR) << "Native exception, stopping now. Check your plugins, if any."; |
705 status = -1; | 706 status = -1; |
706 } | 707 } |
707 | 708 |
708 OrthancFinalize(); | 709 OrthancFinalize(); |
709 | 710 |