Revert "DPL: switch to ws:// as default client for self hosted (#5535)" (#5561)

ktf · web-flow · commit 97bf3184df20 · 2021-02-25T21:34:06.000+01:00
This reverts commit 8514bb0.
diff --git a/Framework/Core/include/Framework/DriverInfo.h b/Framework/Core/include/Framework/DriverInfo.h
@@ -145,11 +145,6 @@ struct DriverInfo {
   DeviceMetricsInfo metrics;
   /// Skip shared memory cleanup if set
   bool noSHMCleanup;
-  /// Default value for the --driver-client-backend. Notice that if we start from
-  /// the driver, the default backend will be the websocket one.  On the other hand,
-  /// if the device is started standalone, the default becomes the old stdout:// so
-  /// that it works as it used to in AliECS.
-  std::string defaultDriverClient = "invalid";
 };
 
 struct DriverInfoHelper {
diff --git a/Framework/Core/src/DeviceSpecHelpers.cxx b/Framework/Core/src/DeviceSpecHelpers.cxx
@@ -1037,7 +1037,7 @@ void DeviceSpecHelpers::prepareArguments(bool defaultQuiet, bool defaultStopped,
     // has option --session been specified on the command line?
     bool haveSessionArg = false;
     using FilterFunctionT = std::function<void(decltype(argc), decltype(argv), decltype(od))>;
-    bool useDefaultWS = true;
+    bool useDefaultWS = false;
 
     // the filter function will forward command line arguments based on the option
     // definition passed to it. All options of the program option definition will be forwarded
@@ -1110,7 +1110,7 @@ void DeviceSpecHelpers::prepareArguments(bool defaultQuiet, bool defaultStopped,
       }
 
       haveSessionArg = haveSessionArg || varmap.count("session") != 0;
-      useDefaultWS = useDefaultWS && ((varmap.count("driver-client-backend") == 0) || varmap["driver-client-backend"].as<std::string>() == "ws://");
+      useDefaultWS = useDefaultWS || (varmap.count("driver-client-backend") != 0) && varmap["driver-client-backend"].as<std::string>() == "ws://";
 
       for (const auto varit : varmap) {
         // find the option belonging to key, add if the option has been parsed
diff --git a/Framework/Core/src/runDataProcessing.cxx b/Framework/Core/src/runDataProcessing.cxx
@@ -935,10 +935,7 @@ void doDefaultWorkflowTerminationHook()
   //LOG(INFO) << "Process " << getpid() << " is exiting.";
 }
 
-int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
-            const o2::framework::DeviceSpec& spec,
-            TerminationPolicy errorPolicy,
-            std::string const& defaultDriverClient,
+int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry, const o2::framework::DeviceSpec& spec, TerminationPolicy errorPolicy,
             uv_loop_t* loop)
 {
   fair::Logger::SetConsoleColor(false);
@@ -949,13 +946,13 @@ int doChild(int argc, char** argv, ServiceRegistry& serviceRegistry,
 
     // Populate options from the command line. Notice that only the options
     // declared in the workflow definition are allowed.
-    runner.AddHook<fair::mq::hooks::SetCustomCmdLineOptions>([&spec, defaultDriverClient](fair::mq::DeviceRunner& r) {
+    runner.AddHook<fair::mq::hooks::SetCustomCmdLineOptions>([&spec](fair::mq::DeviceRunner& r) {
       boost::program_options::options_description optsDesc;
       ConfigParamsHelper::populateBoostProgramOptions(optsDesc, spec.options, gHiddenDeviceOptions);
-      optsDesc.add_options()("monitoring-backend", bpo::value<std::string>()->default_value("default"), "monitoring backend info")                                                           //
-        ("driver-client-backend", bpo::value<std::string>()->default_value(defaultDriverClient), "backend for device -> driver communicataon: stdout://: use stdout, ws://: use websockets") //
-        ("infologger-severity", bpo::value<std::string>()->default_value(""), "minimum FairLogger severity to send to InfoLogger")                                                           //
-        ("configuration,cfg", bpo::value<std::string>()->default_value("command-line"), "configuration backend")                                                                             //
+      optsDesc.add_options()("monitoring-backend", bpo::value<std::string>()->default_value("default"), "monitoring backend info")                                                   //
+        ("driver-client-backend", bpo::value<std::string>()->default_value("stdout://"), "backend for device -> driver communicataon: stdout://: use stdout, ws://: use websockets") //
+        ("infologger-severity", bpo::value<std::string>()->default_value(""), "minimum FairLogger severity to send to InfoLogger")                                                   //
+        ("configuration,cfg", bpo::value<std::string>()->default_value("command-line"), "configuration backend")                                                                     //
         ("infologger-mode", bpo::value<std::string>()->default_value(""), "INFOLOGGER_MODE override");
       r.fConfig.AddToCmdLineOptions(optsDesc, true);
     });
@@ -1366,9 +1363,7 @@ int runStateMachine(DataProcessorSpecs const& workflow,
           if (spec.id == frameworkId) {
             return doChild(driverInfo.argc, driverInfo.argv,
                            serviceRegistry, spec,
-                           driverInfo.errorPolicy,
-                           driverInfo.defaultDriverClient,
-                           loop);
+                           driverInfo.errorPolicy, loop);
           }
         }
         {
@@ -2231,10 +2226,8 @@ int doMain(int argc, char** argv, o2::framework::WorkflowSpec const& workflow,
   if (varmap.count("id")) {
     frameworkId = varmap["id"].as<std::string>();
     driverInfo.uniqueWorkflowId = fmt::format("{}", getppid());
-    driverInfo.defaultDriverClient = "stdout://";
   } else {
     driverInfo.uniqueWorkflowId = fmt::format("{}", getpid());
-    driverInfo.defaultDriverClient = "ws://";
   }
   return runStateMachine(physicalWorkflow,
                          currentWorkflow,
