Skip to content

Commit

Permalink
SILKIT-1483: Fix dashboard participant connecting to invalid port (#748)
Browse files Browse the repository at this point in the history
  • Loading branch information
VDanielEdwards authored and GitHub Enterprise committed Jan 25, 2024
1 parent b86f92d commit ed038bb
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
10 changes: 10 additions & 0 deletions Utilities/SilKitRegistry/Registry.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,14 @@ void OverrideFromRegistryConfiguration(std::shared_ptr<SilKit::Config::IParticip
}
}

void OverrideRegistryUri(std::shared_ptr<SilKit::Config::IParticipantConfiguration> configuration, const std::string& registryUri)
{
auto config = std::dynamic_pointer_cast<SilKit::Config::ParticipantConfiguration>(configuration);
SILKIT_ASSERT(config != nullptr);

config->middleware.registryUri = registryUri;
}

void SanitizeConfiguration(std::shared_ptr<SilKit::Config::IParticipantConfiguration> configuration,
const std::string& listenUri)
{
Expand Down Expand Up @@ -212,6 +220,8 @@ auto StartRegistry(std::shared_ptr<SilKit::Config::IParticipantConfiguration> co

std::cout << "SIL Kit Registry listening on " << chosenListenUri << std::endl;

OverrideRegistryUri(configuration, chosenListenUri);

if (generatedConfigurationPathOpt.HasValue())
{
const auto generatedConfigurationPath = generatedConfigurationPathOpt.Value();
Expand Down
10 changes: 10 additions & 0 deletions docs/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ All notable changes to the Vector SIL Kit project shall be documented in this fi
The format is based on `Keep a Changelog (http://keepachangelog.com/en/1.0.0/) <http://keepachangelog.com/en/1.0.0/>`_.


[4.0.45] - UNRELEASED
---------------------

Fixed
~~~~~

- Registry failed to start correctly, if the dashboard is enabled, but the registry is letting the
system determine the listening port, e.g., when using a URI like ``silkit://localhost:0``.


[4.0.44] - 2024-01-22
---------------------

Expand Down

0 comments on commit ed038bb

Please sign in to comment.