Move admin_port from CLI flag to config file

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: afrind

config.example.yaml

@@ -18,3 +18,6 @@ cache:
   enabled: true               # Enable relay cache
   max_tracks: 100             # Max number of cached tracks
   max_groups_per_track: 3     # Max groups per track in cache
+
+admin:
+  port: 9669                  # HTTP admin server port

include/o_rly/config/config.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstddef>
+#include <cstdint>
 #include <string>
 #include <variant>
 
@@ -33,6 +34,7 @@ struct ListenerConfig {
 struct Config {
   ListenerConfig listener;
   CacheConfig cache;
+  uint16_t adminPort;
 };
 
 } // namespace openmoq::o_rly::config

include/o_rly/config/loader/parsed_config.h

@@ -49,12 +49,17 @@ struct ParsedCacheConfig {
       max_groups_per_track;
 };
 
+struct ParsedAdminConfig {
+  rfl::Description<"HTTP admin server port, 1-65535", uint16_t> port;
+};
+
 struct ParsedConfig {
   rfl::Description<
       "Listener definitions (currently exactly one supported)",
       std::vector<ParsedListenerConfig>>
       listeners;
   rfl::Description<"Relay cache settings", ParsedCacheConfig> cache;
+  rfl::Description<"Admin HTTP server settings", ParsedAdminConfig> admin;
 };
 
 } // namespace openmoq::o_rly::config

src/config/config_resolver.cpp

@@ -63,6 +63,11 @@ folly::Expected<ResolvedConfig, std::string> resolveConfig(const ParsedConfig& c
     }
   }
 
+  // Admin port validation
+  if (config.admin.value().port.value() == 0) {
+    errors.push_back("admin.port must be 1-65535, got 0");
+  }
+
   // Cache validation
   const auto& cache = config.cache.value();
   if (cache.enabled.value()) {
@@ -108,6 +113,7 @@ folly::Expected<ResolvedConfig, std::string> resolveConfig(const ParsedConfig& c
           Config{
               .listener = std::move(resolvedListener),
               .cache = cacheConfig,
+              .adminPort = config.admin.value().port.value(),
           },
       .warnings = std::move(warnings),
   };

src/main.cpp

@@ -14,7 +14,6 @@
 
 DEFINE_string(config, "", "Path to config file (required)");
 DEFINE_bool(strict_config, false, "Reject unknown config fields");
-DEFINE_int32(admin_port, 9669, "HTTP admin port");
 
 namespace {
 
@@ -121,10 +120,10 @@ int main(int argc, char* argv[]) {
   // === 7. Start health checks / admin endpoints ===
   openmoq::o_rly::admin::AdminServer adminServer;
   openmoq::o_rly::admin::registerBuiltinRoutes(adminServer);
-  if (!adminServer.start(static_cast<uint16_t>(FLAGS_admin_port))) {
-    XLOG(FATAL) << "Failed to start admin server on port " << FLAGS_admin_port;
+  if (!adminServer.start(config.adminPort)) {
+    XLOG(FATAL) << "Failed to start admin server on port " << config.adminPort;
   }
-  XLOG(INFO) << "Admin server listening on port " << FLAGS_admin_port;
+  XLOG(INFO) << "Admin server listening on port " << config.adminPort;
 
   // === 8. Start serving ===
   // Bind listeners, accept connections, enter event loop

tests/config/config_resolver_test.cpp

@@ -17,6 +17,12 @@ ParsedCacheConfig makeDefaultCache() {
   return cache;
 }
 
+ParsedAdminConfig makeDefaultAdmin() {
+  ParsedAdminConfig admin;
+  admin.port = uint16_t{9669};
+  return admin;
+}
+
 // Build a minimal valid insecure listener config.
 ParsedConfig makeMinimalInsecureConfig(std::string name = "test") {
   ParsedConfig cfg;
@@ -34,6 +40,7 @@ ParsedConfig makeMinimalInsecureConfig(std::string name = "test") {
   lc.endpoint = std::string("/moq-relay");
   cfg.listeners.value().push_back(std::move(lc));
   cfg.cache = makeDefaultCache();
+  cfg.admin = makeDefaultAdmin();
   return cfg;
 }
 
@@ -42,6 +49,7 @@ ParsedConfig makeMinimalInsecureConfig(std::string name = "test") {
 TEST(ResolveConfig, NoListeners) {
   ParsedConfig cfg;
   cfg.cache = makeDefaultCache();
+  cfg.admin = makeDefaultAdmin();
   auto result = resolveConfig(cfg);
   ASSERT_TRUE(result.hasError());
   EXPECT_THAT(result.error(), HasSubstr("At least one listener"));
@@ -114,6 +122,7 @@ TEST(ResolveConfig, FullTls) {
   lc.moqt_versions = std::vector<uint32_t>{14, 16};
   cfg.listeners.value().push_back(std::move(lc));
   cfg.cache = makeDefaultCache();
+  cfg.admin = makeDefaultAdmin();
 
   auto result = resolveConfig(cfg);
   ASSERT_TRUE(result.hasValue());

tests/config/loader_test.cpp

@@ -29,6 +29,8 @@ TEST(ConfigLoader, MinimalConfig) {
   enabled: true
   max_tracks: 100
   max_groups_per_track: 3
+admin:
+  port: 9669
 )");
 
   auto cfg = loadConfig(yaml.path());
@@ -65,6 +67,8 @@ TEST(ConfigLoader, FullConfig) {
   enabled: true
   max_tracks: 200
   max_groups_per_track: 5
+admin:
+  port: 9669
 )");
 
   auto cfg = loadConfig(yaml.path());
@@ -122,6 +126,8 @@ TEST(ConfigLoader, LoadFromFile) {
   enabled: false
   max_tracks: 100
   max_groups_per_track: 3
+admin:
+  port: 9669
 )");
 
   auto cfg = loadConfig(yaml.path());
@@ -156,6 +162,8 @@ TEST(ConfigLoader, UnknownFieldIgnoredNonStrict) {
   enabled: true
   max_tracks: 100
   max_groups_per_track: 3
+admin:
+  port: 9669
 )");
 
   EXPECT_NO_THROW(loadConfig(yaml.path()));
@@ -177,6 +185,8 @@ TEST(ConfigLoader, UnknownFieldRejectedStrict) {
   enabled: true
   max_tracks: 100
   max_groups_per_track: 3
+admin:
+  port: 9669
 )");
 
   EXPECT_THROW(loadConfig(yaml.path(), /*strict=*/true), std::runtime_error);

tests/test.config.yaml

@@ -12,3 +12,5 @@ cache:
   enabled: true
   max_tracks: 100
   max_groups_per_track: 3
+admin:
+  port: 9669

tests/test_admin_info.sh

@@ -12,7 +12,7 @@ if [[ ! -x "$BINARY" ]]; then
 fi
 
 # Start o_rly with test config in the background.
-"$BINARY" --config="$TESTDIR/test.config.yaml" --admin_port="$ADMIN_PORT" &
+"$BINARY" --config="$TESTDIR/test.config.yaml" &
 O_RLY_PID=$!
 trap 'kill "$O_RLY_PID" 2>/dev/null; wait "$O_RLY_PID" 2>/dev/null || true' EXIT