Merge remote-tracking branch 'origin/development' into development.ps_linux

This commit is contained in:
John Colvin committed 2024-07-09 14:46:18 -04:00
commit 54f37b2401
4 files changed
+81 -9

No files matched your search

+2 -4
View File
@@ -25,11 +25,9 @@ int Run(PubSubServerConfig cfg) {
cfg.MergeWith(PubSubServerConfig.Default());
PubSubConfig.SetGlobalConfig(Log.notnull(cfg.PubSub));
Configuration.initialize(cfg.Sparkd);
bool run_echo_server = false;
bool echo_msg_back = false;
cfg.SimpleEchoServer = run_echo_server;
Log.Gen.info("Starting PubSubServer");
return cfg.SimpleEchoServer ?? false ?
RunEchoServer(cfg.PubSub.ServerPort.assert_value(), echo_msg_back) :
RunEchoServer(cfg.PubSub.ServerPort.assert_value(), false) :
RunPubSubServer();
} catch (Exception ex) {
// Write the error to console first, in case the logging system is compromised.