Compare commits

...

2 Commits

Author SHA1 Message Date
Your Name
342defca6b v0.2.16 - fixed config bugs 2025-09-06 10:24:42 -04:00
Your Name
580aec7d57 v0.2.15 - Add --database-path command line parameter for database location override
- Added -D/--database-path parameter to specify custom database file location
- Fixed port override timing to apply after configuration system initialization
- Updated help message with examples showing database path usage
- Supports both absolute and relative paths for database location
- Enables running multiple relay instances with separate databases
- Resolves database path issues when running from /usr/local/bin
2025-09-06 10:07:28 -04:00
9 changed files with 25 additions and 15 deletions

1
.gitignore vendored
View File

@@ -7,3 +7,4 @@ Trash/
src/version.h
dev-config/
db/
copy_executable_local.sh

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
943745
949770

View File

@@ -577,12 +577,20 @@ const char* get_config_value(const char* key) {
return NULL;
}
// Priority 1: Database configuration (updated from file)
// Priority 1: Command line overrides via environment variables
if (strcmp(key, "relay_port") == 0) {
const char* port_override = getenv("C_RELAY_PORT_OVERRIDE");
if (port_override) {
return port_override;
}
}
// Priority 2: Database configuration (updated from file)
if (get_database_config(key, buffer, sizeof(buffer)) == 0) {
return buffer;
}
// Priority 2: Environment variables (fallback)
// Priority 3: Environment variables (fallback)
const char* env_value = getenv(key);
if (env_value) {
return env_value;

View File

@@ -3052,12 +3052,7 @@ int main(int argc, char* argv[]) {
log_error("Invalid port number");
return 1;
}
// Store port in configuration system
char port_str[16];
snprintf(port_str, sizeof(port_str), "%d", port);
set_database_config("relay_port", port_str, "command_line");
// Re-apply configuration to make sure global variables are updated
apply_configuration_to_globals();
// Port will be stored in configuration system after it's initialized
} else {
log_error("Port argument requires a value");
return 1;
@@ -3118,12 +3113,8 @@ int main(int argc, char* argv[]) {
return 1;
}
// Store database path override in configuration if specified
if (database_path_override) {
if (set_database_config("database_path", database_path_override, "command_line") != 0) {
log_warning("Failed to store database path override in configuration");
}
}
// Database path override is applied via environment variable - no need to store in config
// (storing database path in database creates circular dependency)
// Initialize nostr library BEFORE configuration system
// (required for Nostr event generation in config files)
@@ -3141,6 +3132,16 @@ int main(int argc, char* argv[]) {
return 1;
}
// Apply command line overrides AFTER configuration system is initialized
if (port != DEFAULT_PORT) {
log_info("Applying port override from command line");
printf(" Port: %d\n", port);
// Set environment variable for port override (runtime only, not persisted)
char port_str[16];
snprintf(port_str, sizeof(port_str), "%d", port);
setenv("C_RELAY_PORT_OVERRIDE", port_str, 1);
}
// Initialize NIP-11 relay information
init_relay_info();

BIN
test_check.db Normal file

Binary file not shown.

BIN
test_combined.db Normal file

Binary file not shown.