Merge pull request #2722 in SNORT/snort3 from ~SATHIRKA/snort3:reload_detectors_respo...

Squashed commit of the following:

commit 6af6fafdf8634b8176bf7dcd040d0014e769aca5
Author: Sreeja Athirkandathil Narayanan <sathirka@cisco.com>
Date:   Tue Jan 26 13:09:14 2021 -0500

    appid: Send reloading detectors message to socket immediately

diff --git a/src/network_inspectors/appid/appid_module.cc b/src/network_inspectors/appid/appid_module.cc
index 37e4489655fe1be0bb68f4cf0e9ea3c5bc780231..91809baaf75df49374fd63f94815bbf8c5b00a30 100644 (file)
--- a/src/network_inspectors/appid/appid_module.cc
+++ b/src/network_inspectors/appid/appid_module.cc
@@ -364,8 +364,7 @@ static int reload_detectors(lua_State* L)
         return 0;
     }
     Swapper::set_reload_in_progress(true);
-    bool from_shell = ( L != nullptr );
-    current_request->respond(".. reloading detectors\n", from_shell);
+    current_request->respond(".. reloading detectors\n");
 
     AppIdContext& ctxt = inspector->get_ctxt();
     OdpContext& old_odp_ctxt = ctxt.get_odp_ctxt();
@@ -384,6 +383,7 @@ static int reload_detectors(lua_State* L)
     odp_thread_local_ctxt->initialize(ctxt, true, true);
     odp_ctxt.initialize();
 
+    bool from_shell = ( L != nullptr );
     current_request->respond("== swapping detectors configuration\n", from_shell);
     main_broadcast_command(new ACOdpContextSwap(*inspector, old_odp_ctxt,
         current_request, from_shell), from_shell);