Skip to content

Feature/SK-1717 | Start combiner server if run as __main__ #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Wrede
Copy link
Member

@Wrede Wrede commented Aug 21, 2025

This pull request introduces several configuration and startup changes for the combiner service, focusing on how it loads configuration files, sets environment variables, and starts the service process. The changes improve flexibility and standardization in configuration management and service initialization.

Configuration management improvements:

  • Added support for specifying the combiner configuration file path via the FEDN_COMBINER_CONFIG environment variable in fedn/common/config.py, with a default fallback location.
  • Updated the combiner YAML templates (config/settings-combiner.yaml.local.template and config/settings-combiner.yaml.template) to include new fields fqdn and secure for more flexible network configuration. [1] [2]

Service startup and Docker integration:

  • Modified the combiner service entrypoint in docker-compose.yaml to start the combiner using a Python script (combiner.py) instead of the previous CLI command, and added the FEDN_COMBINER_CONFIG environment variable to the container environment. [1] [2]
  • Refactored fedn/network/combiner/combiner.py to load configuration from the file specified by FEDN_COMBINER_CONFIG, validate its existence, and initialize the service using the loaded configuration. [1] [2] [3]

@github-actions github-actions bot added feature New feature or request minor labels Aug 21, 2025
@Wrede Wrede changed the title start combiner server if run as __main__ Feature/SK-1717 | Start combiner server if run as __main__ Aug 21, 2025
Copy link
Contributor

@carl-andersson carl-andersson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the reason behind using this rather then the cli combiner start?

There's now code duplication since the old instructions are still there. Try make them the same

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature New feature or request minor
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants