From: Shravan Rangarajuvenkata (shrarang) <shrarang@cisco.com>
Date: Thu, 28 Jan 2021 20:26:15 +0000 (+0000)
Subject: Merge pull request #2722 in SNORT/snort3 from ~SATHIRKA/snort3:reload_detectors_respo... 
X-Git-Tag: 3.1.2.0~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6944862b814aa85cd1b6b1b778bc4fd67fe51e11;p=thirdparty%2Fsnort3.git

Merge pull request #2722 in SNORT/snort3 from ~SATHIRKA/snort3:reload_detectors_response to master

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 37e448965..91809baaf 100644
--- 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);