jeka/utun2
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Preserve selected global log path and verify database owner reload

Browse Source
This commit is contained in:
evgeny committed 2026-10-26 09:08:42 +01:00
1 parent 06ad255b95
commit 44103038c0
2 files changed
+31 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/utun_instance.c
+1 -1
View File
@@ -371,7 +371,7 @@ struct UTUN_INSTANCE* utun_instance_create_from_config(struct UASYNC* ua, struct
DEBUG_ERROR(DEBUG_CATEGORY_CONFIG, "instance create requires uasync and config");
return NULL;
}
if (config->global.log_file[0]) {
if (config->global.log_file[0] && !g_debug_config.file_output) {
snprintf(g_config_log_path, sizeof(g_config_log_path), "%s", config->global.log_file);
debug_set_output_file(g_config_log_path);
}
tests/test_instance_contract.c
+30 -1
View File
@@ -202,13 +202,42 @@ static void test_headless(struct UASYNC* ua) {
DEBUG_INFO(DEBUG_CATEGORY_SYS, "PASS chat-only lifecycle: three headless ports/clients, timer faults, retained SQLite and malformed binds");
}
static void test_database_and_logger(struct UASYNC* ua) {
char root[] = "/tmp/utun-instance-owners-XXXXXX"; assert(mkdtemp(root));
char path[256], db_a[256], db_b[256], log_a[256], log_b[256], extras[1024], file[512];
snprintf(path, sizeof(path), "%s/config", root); snprintf(db_a, sizeof(db_a), "%s/one/deep", root);
snprintf(db_b, sizeof(db_b), "%s/two", root); snprintf(log_a, sizeof(log_a), "%s/first.log", root);
snprintf(log_b, sizeof(log_b), "%s/second.log", root);
snprintf(extras, sizeof(extras), "[global]\ndb_path=%s\nlog_file=%s\n", db_a, log_a);
write_config(path, "same owner", "", extras);
struct UTUN_INSTANCE* inst = utun_instance_create(ua, path); assert(inst && !inst->core_started);
snprintf(file, sizeof(file), "%s/chats.db", db_a);
assert(!strcmp(sqlite3_db_filename(inst->topo_sqlite_db, "main"), file));
assert(sqlite3_exec(inst->topo_sqlite_db, "CREATE TABLE instance_contract(value); INSERT INTO instance_contract VALUES(7)",
NULL, NULL, NULL) == SQLITE_OK);
snprintf(extras, sizeof(extras), "[global]\ndb_path=%s\nlog_file=%s\n", db_b, log_b);
write_config(path, "same owner", "", extras);
inst = utun_instance_reload(inst, ua, path); assert(inst && !inst->core_started && !inst->running);
snprintf(file, sizeof(file), "%s/chats.db", db_b);
assert(!strcmp(sqlite3_db_filename(inst->topo_sqlite_db, "main"), file));
assert(!strcmp(g_debug_config.output_file, log_a)); // уже открытый общий logger сохраняет первый путь
utun_instance_destroy(inst);
assert(!strcmp(g_debug_config.output_file, log_a) && !debug_reopen_log()); // config освобождён, путь остаётся жив
debug_disable_file_output();
snprintf(file, sizeof(file), "%s/chats.db", db_a); assert(!unlink(file));
snprintf(file, sizeof(file), "%s/chats.db", db_b); assert(!unlink(file));
assert(!unlink(path) && !unlink(log_a) && !rmdir(db_a) && !rmdir(db_b));
snprintf(file, sizeof(file), "%s/one", root); assert(!rmdir(file) && !rmdir(root));
DEBUG_INFO(DEBUG_CATEGORY_SYS, "PASS db_path restart, recursive directory, stopped state and logger path after config destruction");
}
int main(void) {
debug_config_init(); debug_set_level(DEBUG_LEVEL_WARN); debug_set_category_level(DEBUG_CATEGORY_SYS, DEBUG_LEVEL_INFO);
debug_set_category_level(DEBUG_CATEGORY_DEBUG, DEBUG_LEVEL_INFO);
test_callbacks();
size_t baseline = u_get_allocated_count();
struct UASYNC* ua = uasync_create(); assert(ua);
test_creation(ua); test_reload(ua); test_headless(ua);
test_creation(ua); test_reload(ua); test_headless(ua); test_database_and_logger(ua);
uasync_poll(ua, 0); // удалённые heap-таймеры освобождаются при следующем poll
debug_set_category_level(DEBUG_CATEGORY_SYS, DEBUG_LEVEL_INFO);
uasync_print_resources(ua, "instance contract before owner destroy");