Compare commits

...

3 Commits

Author SHA1 Message Date
Your Name
a02c1204ce v0.2.18 - Clean up configuration system: remove active_config VIEW, database_location field, fix double slash in paths, and ensure database_path reflects actual path used 2025-09-06 11:01:50 -04:00
Your Name
258779e234 v0.2.17 - Add --database-path parameter with metadata storage
- Add --database-path/-D command line parameter for database override
- Store actual database and config file paths as metadata in config tables
- Fix circular dependency by making command line overrides runtime-only
- Support multiple relay instances with separate databases and configurations
- Clean path normalization removes redundant ./ prefixes
- New fields: database_location and config_location for tracking actual usage
2025-09-06 10:39:11 -04:00
Your Name
342defca6b v0.2.16 - fixed config bugs 2025-09-06 10:24:42 -04:00
12 changed files with 98 additions and 28 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.

View File

@@ -1 +1 @@
943745
960728

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

@@ -3113,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)
@@ -3136,15 +3132,94 @@ int main(int argc, char* argv[]) {
return 1;
}
// Update database_path field to reflect actual database path used
if (database_path_override) {
// Convert to absolute path and normalize
char actual_db_path[1024];
if (database_path_override[0] == '/') {
// Already absolute
strncpy(actual_db_path, database_path_override, sizeof(actual_db_path) - 1);
} else {
// Make absolute by prepending current working directory
char cwd[1024];
if (getcwd(cwd, sizeof(cwd))) {
// Handle the case where path starts with ./
const char* clean_path = database_path_override;
if (strncmp(database_path_override, "./", 2) == 0) {
clean_path = database_path_override + 2;
}
// Ensure we don't exceed buffer size
int written = snprintf(actual_db_path, sizeof(actual_db_path), "%s/%s", cwd, clean_path);
if (written >= (int)sizeof(actual_db_path)) {
log_warning("Database path too long, using original path");
strncpy(actual_db_path, database_path_override, sizeof(actual_db_path) - 1);
actual_db_path[sizeof(actual_db_path) - 1] = '\0';
}
} else {
strncpy(actual_db_path, database_path_override, sizeof(actual_db_path) - 1);
}
}
actual_db_path[sizeof(actual_db_path) - 1] = '\0';
// Update the database_path configuration to reflect actual path used
if (set_database_config("database_path", actual_db_path, "system") == 0) {
log_info("Updated database_path configuration with actual path used");
} else {
log_warning("Failed to update database_path configuration");
}
}
// Store metadata about configuration file path used
if (strlen(g_config_manager.config_file_path) > 0) {
// Convert to absolute path and normalize (fix double slash issue)
char actual_config_path[1024];
if (g_config_manager.config_file_path[0] == '/') {
// Already absolute - use as-is
strncpy(actual_config_path, g_config_manager.config_file_path, sizeof(actual_config_path) - 1);
} else {
// Make absolute by prepending current working directory
char cwd[1024];
if (getcwd(cwd, sizeof(cwd))) {
// Handle the case where path starts with ./
const char* clean_path = g_config_manager.config_file_path;
if (strncmp(g_config_manager.config_file_path, "./", 2) == 0) {
clean_path = g_config_manager.config_file_path + 2;
}
// Remove any trailing slash from cwd to avoid double slash
size_t cwd_len = strlen(cwd);
if (cwd_len > 0 && cwd[cwd_len - 1] == '/') {
cwd[cwd_len - 1] = '\0';
}
// Remove any leading slash from clean_path to avoid double slash
if (clean_path[0] == '/') {
clean_path++;
}
snprintf(actual_config_path, sizeof(actual_config_path), "%s/%s", cwd, clean_path);
} else {
strncpy(actual_config_path, g_config_manager.config_file_path, sizeof(actual_config_path) - 1);
}
}
actual_config_path[sizeof(actual_config_path) - 1] = '\0';
if (set_database_config("config_location", actual_config_path, "system") == 0) {
log_info("Stored configuration location metadata");
} else {
log_warning("Failed to store configuration location metadata");
}
}
// 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);
if (set_database_config("relay_port", port_str, "command_line") != 0) {
log_warning("Failed to set port override in configuration");
}
setenv("C_RELAY_PORT_OVERRIDE", port_str, 1);
}
// Initialize NIP-11 relay information

View File

@@ -6,7 +6,7 @@
#define SQL_SCHEMA_H
/* Schema version constant */
#define EMBEDDED_SCHEMA_VERSION "3"
#define EMBEDDED_SCHEMA_VERSION "4"
/* Embedded SQL schema as C string literal */
static const char* const EMBEDDED_SCHEMA_SQL =
@@ -14,7 +14,7 @@ static const char* const EMBEDDED_SCHEMA_SQL =
-- SQLite schema for storing Nostr events with JSON tags support\n\
\n\
-- Schema version tracking\n\
PRAGMA user_version = 3;\n\
PRAGMA user_version = 4;\n\
\n\
-- Enable foreign key support\n\
PRAGMA foreign_keys = ON;\n\
@@ -267,20 +267,6 @@ BEGIN\n\
VALUES (NEW.key, OLD.value, NEW.value, 'system', 'configuration update');\n\
END;\n\
\n\
-- Active Configuration View\n\
CREATE VIEW active_config AS\n\
SELECT\n\
key,\n\
value,\n\
description,\n\
config_type,\n\
data_type,\n\
requires_restart,\n\
updated_at\n\
FROM config\n\
WHERE config_type IN ('system', 'user')\n\
ORDER BY config_type, key;\n\
\n\
-- Runtime Statistics View\n\
CREATE VIEW runtime_stats AS\n\
SELECT\n\

BIN
test_check.db Normal file

Binary file not shown.

BIN
test_clean_paths.db Normal file

Binary file not shown.

BIN
test_metadata.db Normal file

Binary file not shown.

BIN
test_override.db-wal Normal file

Binary file not shown.