CDPP / AMDA_Kernel

Commit 4e5d4e69eec8e92e85bdd5c1f0dd825c1f7ecc97

Authored by Benjamin Renard
1 parent aae52524
Exists in master and in 87 other branches 10038, 10098, 5390, 5770, 6728, 7616, 7811, 7875, 8034_7628, 8038, 8041, 8045_8044, 8295, 8459, 8528, 8928, 9016, 9016Bis, 9017, 9017-new, 9049, 9084, 9259, 9326, 9347, 9383, 9719, 9719.new, AllLegends, CDF_ISTP, CDF_ISTP_HOPEFULLY_ALL_WORKING, FER_10400, FER_10412, FER_10663, FER_10765, FER_11000, FER_11100, FER_11242, FER_11277, FER_11500, FER_11537, FER_11588, FER_11651, FER_19836, FER_5344, FER_6031, FER_6598, FER_6966, FER_7318, FER_7618, FER_7857, FER_8455, FER_9629, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, JUNO_JEDI, MAZ_10936, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, SpeasyGet, amdadev, amdadev_test, cu2022, das2, density_maps, develop, evol_9042, expression-parser-bre, feature/9259, frames-transformation, pickle, rm_5776, rm_6015, rm_6616, rm_6616_bis, rm_6912, rm_7926, rm_8050, rm_8932, shue, shue97, test-merge, ubuntu

Skip plugin load with parser

Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
Inline Side-by-side
src/Common/Application.cc
  Diff comments   View file @4e5d4e6
... ... @@ -67,7 +67,7 @@ namespace AMDA {
67 67 namespace Common {
68 68  
69 69 int Application::main(int argc, char *argv[],
70   - std::function<int(int argc, char *argv[], AMDA::helpers::Properties&)> exec) {
  70 + std::function<int(int argc, char *argv[], AMDA::helpers::Properties&)> exec, bool skipPluginLoad) {
71 71 int result = AMDA_EXIT_OK;
72 72  
73 73 try {
... ... @@ -99,7 +99,7 @@ namespace AMDA {
99 99 servicesServer->setConfigurator(configurator);
100 100  
101 101 std::string lPluginPath = lProperties["app.plugin"];
102   - if (!lPluginPath.empty()) {
  102 + if (!lPluginPath.empty() && !skipPluginLoad) {
103 103 AMDA::Plugins::PluginManager::getInstance()->loadPluginFromPath(
104 104 lPluginPath);
105 105 }
... ...
src/Common/Application.hh
  Diff comments   View file @4e5d4e6
... ... @@ -17,7 +17,7 @@ namespace Common {
17 17  
18 18 class Application {
19 19 public:
20   - int main(int argc, char *argv[], std::function<int (int argc, char *argv[], AMDA::helpers::Properties&)> exec);
  20 + int main(int argc, char *argv[], std::function<int (int argc, char *argv[], AMDA::helpers::Properties&)> exec, bool skipPluginLoad = false);
21 21  
22 22 };
23 23  
... ...
src/expressionParser/Main.cc
  Diff comments   View file @4e5d4e6
... ... @@ -148,6 +148,6 @@ int main(int argc, char *argv[]) {
148 148 }
149 149  
150 150 return result;
151   - });
  151 + }, true); //Skip plugin load
152 152 }
153 153  
... ...