laantungir/c-relay
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

v0.2.12 - Command line variables added

Browse Source
This commit is contained in:
Your Name
2025-09-06 07:41:43 -04:00
parent 6f51f445b7
commit 6d9b4efb7e
8 changed files with 98 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/config.c
View File

@@ -34,16 +34,38 @@ int init_configuration_system(void) {
memset(&g_config_manager, 0, sizeof(config_manager_t));
g_config_manager.db = g_db;
// Get XDG configuration directory
if (get_xdg_config_dir(g_config_manager.config_dir_path, sizeof(g_config_manager.config_dir_path)) != 0) {
log_error("Failed to determine XDG configuration directory");
return -1;
// Check for command line config file override first
const char* config_file_override = getenv(CONFIG_FILE_OVERRIDE_ENV);
if (config_file_override && strlen(config_file_override) > 0) {
// Use specific config file override
strncpy(g_config_manager.config_file_path, config_file_override,
sizeof(g_config_manager.config_file_path) - 1);
g_config_manager.config_file_path[sizeof(g_config_manager.config_file_path) - 1] = '\0';
// Extract directory from file path for config_dir_path
char* last_slash = strrchr(g_config_manager.config_file_path, '/');
if (last_slash) {
size_t dir_len = last_slash - g_config_manager.config_file_path;
strncpy(g_config_manager.config_dir_path, g_config_manager.config_file_path, dir_len);
g_config_manager.config_dir_path[dir_len] = '\0';
} else {
// File in current directory
strcpy(g_config_manager.config_dir_path, ".");
}
log_info("Using configuration file from command line override");
} else {
// Get XDG configuration directory (with --config-dir override support)
if (get_xdg_config_dir(g_config_manager.config_dir_path, sizeof(g_config_manager.config_dir_path)) != 0) {
log_error("Failed to determine configuration directory");
return -1;
}
// Build configuration file path
snprintf(g_config_manager.config_file_path, sizeof(g_config_manager.config_file_path),
"%s/%s", g_config_manager.config_dir_path, CONFIG_FILE_NAME);
}
// Build configuration file path
snprintf(g_config_manager.config_file_path, sizeof(g_config_manager.config_file_path),
"%s/%s", g_config_manager.config_dir_path, CONFIG_FILE_NAME);
log_info("Configuration directory: %s");
printf(" %s\n", g_config_manager.config_dir_path);
log_info("Configuration file: %s");
@@ -273,13 +295,22 @@ int load_config_from_database(void) {
// ================================
int get_xdg_config_dir(char* path, size_t path_size) {
const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
// Priority 1: Command line --config-dir override
const char* config_dir_override = getenv(CONFIG_DIR_OVERRIDE_ENV);
if (config_dir_override && strlen(config_dir_override) > 0) {
strncpy(path, config_dir_override, path_size - 1);
path[path_size - 1] = '\0';
log_info("Using config directory from command line override");
return 0;
}
// Priority 2: XDG_CONFIG_HOME environment variable
const char* xdg_config_home = getenv("XDG_CONFIG_HOME");
if (xdg_config_home && strlen(xdg_config_home) > 0) {
// Use XDG_CONFIG_HOME if set
snprintf(path, path_size, "%s/%s", xdg_config_home, CONFIG_XDG_DIR_NAME);
} else {
// Fall back to ~/.config
// Priority 3: Fall back to ~/.config
const char* home = getenv("HOME");
if (!home) {
log_error("Neither XDG_CONFIG_HOME nor HOME environment variable is set");

2
src/config.h
View File

@@ -14,6 +14,8 @@
#define CONFIG_FILE_NAME "c_relay_config_event.json"
#define CONFIG_ADMIN_PRIVKEY_ENV "C_RELAY_ADMIN_PRIVKEY"
#define CONFIG_RELAY_PRIVKEY_ENV "C_RELAY_PRIVKEY"
#define CONFIG_DIR_OVERRIDE_ENV "C_RELAY_CONFIG_DIR_OVERRIDE"
#define CONFIG_FILE_OVERRIDE_ENV "C_RELAY_CONFIG_FILE_OVERRIDE"
#define NOSTR_PUBKEY_HEX_LENGTH 64
#define NOSTR_PRIVKEY_HEX_LENGTH 64
#define NOSTR_EVENT_ID_HEX_LENGTH 64

35
src/main.c
View File

@@ -3012,13 +3012,22 @@ void print_usage(const char* program_name) {
printf("C Nostr Relay Server\n");
printf("\n");
printf("Options:\n");
printf(" -p, --port PORT Listen port (default: %d)\n", DEFAULT_PORT);
printf(" -h, --help Show this help message\n");
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(" -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("\n");
}
int main(int argc, char* argv[]) {
int port = DEFAULT_PORT;
char* config_dir_override = NULL;
char* config_file_override = NULL;
// Parse command line arguments
for (int i = 1; i < argc; i++) {
@@ -3042,6 +3051,20 @@ int main(int argc, char* argv[]) {
log_error("Port argument requires a value");
return 1;
}
} else if (strcmp(argv[i], "-c") == 0 || strcmp(argv[i], "--config") == 0) {
if (i + 1 < argc) {
config_file_override = argv[++i];
} else {
log_error("Config file argument requires a value");
return 1;
}
} else if (strcmp(argv[i], "-d") == 0 || strcmp(argv[i], "--config-dir") == 0) {
if (i + 1 < argc) {
config_dir_override = argv[++i];
} else {
log_error("Config directory argument requires a value");
return 1;
}
} else {
log_error("Unknown argument");
print_usage(argv[0]);
@@ -3049,6 +3072,14 @@ int main(int argc, char* argv[]) {
}
}
// Store config overrides in global variables for configuration system access
if (config_dir_override) {
setenv("C_RELAY_CONFIG_DIR_OVERRIDE", config_dir_override, 1);
}
if (config_file_override) {
setenv("C_RELAY_CONFIG_FILE_OVERRIDE", config_file_override, 1);
}
// Set up signal handlers
signal(SIGINT, signal_handler);
signal(SIGTERM, signal_handler);