From 370418631c67ff45dfb3b997a1d5e4124c2ccd0d Mon Sep 17 00:00:00 2001 From: Thulinma Date: Sun, 1 Jan 2017 23:20:49 +0100 Subject: [PATCH] Improved controller shutdown speed --- src/controller/controller.cpp | 5 +++++ src/controller/controller_license.cpp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/controller/controller.cpp b/src/controller/controller.cpp index d0549a1f..67a657b8 100644 --- a/src/controller/controller.cpp +++ b/src/controller/controller.cpp @@ -383,12 +383,17 @@ int main_loop(int argc, char ** argv){ }//indentation intentionally wrong, to minimize Pro/nonPro diffs /*LTS-END*/ //join all joinable threads + HIGH_MSG("Joining stats thread..."); statsThread.join(); + HIGH_MSG("Joining monitor thread..."); monitorThread.join(); /*LTS-START*/ + HIGH_MSG("Joining uplink thread..."); uplinkThread.join(); + HIGH_MSG("Joining push thread..."); pushThread.join(); #ifdef LICENSING + HIGH_MSG("Joining license thread..."); licenseThread.join(); #endif /*LTS-END*/ diff --git a/src/controller/controller_license.cpp b/src/controller/controller_license.cpp index a0d724ac..34919b6b 100644 --- a/src/controller/controller_license.cpp +++ b/src/controller/controller_license.cpp @@ -183,7 +183,7 @@ namespace Controller{ now = Util::epoch(); } } - Util::wait(2000);//wait at least 2 seconds + Util::sleep(1000);//sleep a bit } } }