mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-24 22:58:21 +00:00
Merge "config: Fix locking for extconfig reload."
This commit is contained in:
@@ -2839,8 +2839,6 @@ static void clear_config_maps(void)
|
|||||||
{
|
{
|
||||||
struct ast_config_map *map;
|
struct ast_config_map *map;
|
||||||
|
|
||||||
SCOPED_MUTEX(lock, &config_lock);
|
|
||||||
|
|
||||||
while (config_maps) {
|
while (config_maps) {
|
||||||
map = config_maps;
|
map = config_maps;
|
||||||
config_maps = config_maps->next;
|
config_maps = config_maps->next;
|
||||||
@@ -2894,6 +2892,7 @@ int read_config_maps(void)
|
|||||||
char *driver, *table, *database, *textpri, *stringp, *tmp;
|
char *driver, *table, *database, *textpri, *stringp, *tmp;
|
||||||
struct ast_flags flags = { CONFIG_FLAG_NOREALTIME };
|
struct ast_flags flags = { CONFIG_FLAG_NOREALTIME };
|
||||||
int pri;
|
int pri;
|
||||||
|
SCOPED_MUTEX(lock, &config_lock);
|
||||||
|
|
||||||
clear_config_maps();
|
clear_config_maps();
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user