Merged revisions 30033 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r30033 | file | 2006-05-24 16:14:01 -0300 (Wed, 24 May 2006) | 2 lines Fix deadlock caused by a race condition in the logger when reloading (issue #7195 reported and fixed by softins) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@30034 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
parent
2671db4051
commit
24de8a5db9
2
logger.c
2
logger.c
|
@ -385,6 +385,7 @@ int reload_logger(int rotate)
|
|||
FILE *myf;
|
||||
int x, res = 0;
|
||||
|
||||
ast_mutex_lock(&msglist_lock); /* to avoid deadlock */
|
||||
ast_mutex_lock(&loglock);
|
||||
if (eventlog)
|
||||
fclose(eventlog);
|
||||
|
@ -491,6 +492,7 @@ int reload_logger(int rotate)
|
|||
}
|
||||
}
|
||||
ast_mutex_unlock(&loglock);
|
||||
ast_mutex_unlock(&msglist_lock);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
|
Reference in New Issue