Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature: allow setting (game) coordinator and content server connection strings using environment variables #9429

Merged
merged 1 commit into from Jul 10, 2021
Merged

Feature: allow setting (game) coordinator and content server connection strings using environment variables #9429

merged 1 commit into from Jul 10, 2021

Conversation

rubidium42
Copy link
Contributor

Motivation / Problem

Someone was complaining that it requires recompiling to test new networking features against a staging server.

Description

Add functionality to read the game coordinator and content server connection strings from an environment variable.

  • OTTD_COORDINATOR_CS for the game coordinator defaults to coordinator.openttd.org:3976
  • OTTD_CONTENT_SERVER_CS for the content server defaults to content.openttd.org:3978
  • OTTD_CONTENT_MIRROR_CS for the content mirror server defaults to binaries.openttd.org:80

The TCPConnecter already expected a connection string (ip:port) where the port might be omitted, in which case it gets replaced with the default port number of that type of connection.

Limitations

None.

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')

@rubidium42
Feature: allow setting (game) coordinator and content server connecti…
5822bbd 
…on strings using environment variables

OTTD_COORDINATOR_CS for the game coordinator defaults to coordinator.openttd.org:3976
OTTD_CONTENT_SERVER_CS for the content server defaults to content.openttd.org:3978
OTTD_CONTENT_MIRROR_CS for the content mirror server defaults to binaries.openttd.org:80
@rubidium42 rubidium42 merged commit e991346 into OpenTTD:master Jul 10, 2021
@rubidium42 rubidium42 deleted the env branch July 10, 2021 21:09
@TrueBrain TrueBrain mentioned this pull request Jul 11, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TrueBrain TrueBrain TrueBrain approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@rubidium42 @TrueBrain