Compare commits

...

3 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
Your Name
54b91af76c v0.2.14 - database path 2025-09-06 09:59:14 -04:00
10 changed files with 58 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 @@
913504
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

@@ -1941,8 +1941,15 @@ int validate_event_expiration(cJSON* event, char* error_message, size_t error_si
// Initialize database connection and schema
int init_database() {
// Use configurable database path, falling back to default
const char* db_path = get_config_value("database_path");
// Priority 1: Command line database path override
const char* db_path = getenv("C_RELAY_DATABASE_PATH_OVERRIDE");
// Priority 2: Configuration system (if available)
if (!db_path) {
db_path = get_config_value("database_path");
}
// Priority 3: Default path
if (!db_path) {
db_path = DEFAULT_DATABASE_PATH;
}
@@ -3015,12 +3022,15 @@ void print_usage(const char* program_name) {
printf(" -p, --port PORT Listen port (default: %d)\n", DEFAULT_PORT);
printf(" -c, --config FILE Configuration file path\n");
printf(" -d, --config-dir DIR Configuration directory path\n");
printf(" -D, --database-path PATH Database file path (default: %s)\n", DEFAULT_DATABASE_PATH);
printf(" -h, --help Show this help message\n");
printf("\n");
printf("Examples:\n");
printf(" %s --config /path/to/config.json\n", program_name);
printf(" %s --config-dir ~/.config/c-relay-dev\n", program_name);
printf(" %s --port 9999 --config-dir /etc/c-relay\n", program_name);
printf(" %s --database-path /var/lib/c-relay/relay.db\n", program_name);
printf(" %s --database-path ./test.db --port 7777\n", program_name);
printf("\n");
}
@@ -3028,6 +3038,7 @@ int main(int argc, char* argv[]) {
int port = DEFAULT_PORT;
char* config_dir_override = NULL;
char* config_file_override = NULL;
char* database_path_override = NULL;
// Parse command line arguments
for (int i = 1; i < argc; i++) {
@@ -3041,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;
@@ -3065,6 +3071,13 @@ int main(int argc, char* argv[]) {
log_error("Config directory argument requires a value");
return 1;
}
} else if (strcmp(argv[i], "-D") == 0 || strcmp(argv[i], "--database-path") == 0) {
if (i + 1 < argc) {
database_path_override = argv[++i];
} else {
log_error("Database path argument requires a value");
return 1;
}
} else {
log_error("Unknown argument");
print_usage(argv[0]);
@@ -3086,12 +3099,23 @@ int main(int argc, char* argv[]) {
printf(BLUE BOLD "=== C Nostr Relay Server ===" RESET "\n");
// Apply database path override BEFORE any database operations
if (database_path_override) {
log_info("Database path override specified from command line");
printf(" Override path: %s\n", database_path_override);
// Set environment variable so init_database can use the correct path
setenv("C_RELAY_DATABASE_PATH_OVERRIDE", database_path_override, 1);
}
// Initialize database FIRST (required for configuration system)
if (init_database() != 0) {
log_error("Failed to initialize database");
return 1;
}
// 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)
if (nostr_init() != 0) {
@@ -3108,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.

BIN
test_db.db-wal Normal file

Binary file not shown.