From f0e8eb2a5e33103b718e876416594c6ccbfa367b Mon Sep 17 00:00:00 2001 From: Nathan Neulinger Date: Wed, 2 Oct 2013 12:24:34 -0500 Subject: [PATCH] FS-5832 additional hostname updates for failover behavior --- src/switch_console.c | 3 ++- src/switch_core_sqldb.c | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/switch_console.c b/src/switch_console.c index 1f34d13428..63fe575856 100644 --- a/src/switch_console.c +++ b/src/switch_console.c @@ -1882,7 +1882,8 @@ SWITCH_DECLARE(switch_status_t) switch_console_set_complete(const char *string) } else if (!strcasecmp(argv[0], "del")) { char *what = argv[1]; if (!strcasecmp(what, "*")) { - switch_core_sql_exec("delete from complete"); + mystream.write_function(&mystream, "delete from complete where hostname='%s'", switch_core_get_hostname()); + switch_core_sql_exec(mystream.data); } else { mystream.write_function(&mystream, "delete from complete where "); for (x = 0; x < argc - 1; x++) { diff --git a/src/switch_core_sqldb.c b/src/switch_core_sqldb.c index 0754e6a1f0..a8d4c20379 100644 --- a/src/switch_core_sqldb.c +++ b/src/switch_core_sqldb.c @@ -2317,7 +2317,7 @@ static void core_event_handler(switch_event_t *event) new_sql() = switch_mprintf("delete from channels where hostname='%q';" "delete from interfaces where hostname='%q';" "delete from calls where hostname='%q'", - switch_core_get_switchname(), switch_core_get_switchname(), switch_core_get_switchname() + switch_core_get_switchname(), switch_core_get_hostname(), switch_core_get_switchname() ); break; case SWITCH_EVENT_LOG: @@ -3106,7 +3106,7 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_ case SCDB_TYPE_ODBC: if (switch_test_flag((&runtime), SCF_CLEAR_SQL)) { char sql[512] = ""; - char *tables[] = { "channels", "calls", "interfaces", "tasks", NULL }; + char *tables[] = { "channels", "calls", "tasks", NULL }; int i; const char *hostname = switch_core_get_switchname(); @@ -3265,8 +3265,18 @@ switch_status_t switch_core_sqldb_start(switch_memory_pool_t *pool, switch_bool_ break; } + if (switch_test_flag((&runtime), SCF_CLEAR_SQL)) { + char sql[512] = ""; + char *tables[] = { "complete", "interfaces", NULL }; + int i; + const char *hostname = switch_core_get_hostname(); + + for (i = 0; tables[i]; i++) { + switch_snprintfv(sql, sizeof(sql), "delete from %q where hostname='%q'", tables[i], hostname); + switch_cache_db_execute_sql(sql_manager.dbh, sql, NULL); + } + } - switch_cache_db_execute_sql(sql_manager.dbh, "delete from complete where sticky=0", NULL); switch_cache_db_execute_sql(sql_manager.dbh, "delete from aliases where sticky=0", NULL); switch_cache_db_execute_sql(sql_manager.dbh, "delete from nat where sticky=0", NULL); switch_cache_db_execute_sql(sql_manager.dbh, "create index alias1 on aliases (alias)", NULL);