Idefisk
Tools
Tutorials
Reviews
VoIP Providers
Archives
AsteriskGuru Archives
Mailing List Archives
FAQ
Search
Memberlist
Usergroups
Register
Profile
Log in to check your private messages
Log in
[svn-commits] twilson: branch twilson/calendaring r197693 -
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
View previous topic
::
View next topic
Author
Message
svn-commits at lists.digi
Guest
Posted: Thu May 28, 2009 5:18 pm
Post subject: [svn-commits] twilson: branch twilson/calendaring r197693 -
Author: twilson
Date: Thu May 28 13:13:51 2009
New Revision: 197693
URL:
http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=197693
Log:
Fix log message and add trylock code to other tech modules
Modified:
team/twilson/calendaring/res/res_caldav.c
team/twilson/calendaring/res/res_exchangecal.c
team/twilson/calendaring/res/res_icalendar.c
Modified: team/twilson/calendaring/res/res_caldav.c
URL:
http://svn.asterisk.org/svn-view/asterisk/team/twilson/calendaring/res/res_caldav.c?view=diff&rev=197693&r1=197692&r2=197693
==============================================================================
--- team/twilson/calendaring/res/res_caldav.c (original)
+++ team/twilson/calendaring/res/res_caldav.c Thu May 28 13:13:51 2009
@@ -549,7 +549,7 @@
if (cal->unloading) {
ast_log(LOG_WARNING, "Unloading module, load_calendar cancelled.\n");
} else {
- ast_log(LOG_WARNING, "Could not lock calendar, which is totally freaking me out. I give up.\n");
+ ast_log(LOG_WARNING, "Could not lock calendar, aborting!\n");
}
return NULL;
}
Modified: team/twilson/calendaring/res/res_exchangecal.c
URL:
http://svn.asterisk.org/svn-view/asterisk/team/twilson/calendaring/res/res_exchangecal.c?view=diff&rev=197693&r1=197692&r2=197693
==============================================================================
--- team/twilson/calendaring/res/res_exchangecal.c (original)
+++ team/twilson/calendaring/res/res_exchangecal.c Thu May 28 13:13:51 2009
@@ -628,12 +628,19 @@
return NULL;
}
+ if (ao2_trylock(cal)) {
+ if (cal->unloading) {
+ ast_log(LOG_WARNING, "Unloading module, load_calendar cancelled.\n");
+ } else {
+ ast_log(LOG_WARNING, "Could not lock calendar, aborting!\n");
+ }
+ return NULL;
+ }
+
if (!(pvt = ao2_alloc(sizeof(*pvt), exchangecal_destructor))) {
ast_log(LOG_ERROR, "Could not allocate exchangecal_pvt structure for calendar: %s\n", cal->name);
return NULL;
}
-
- ao2_lock(cal);
pvt->owner = cal;
Modified: team/twilson/calendaring/res/res_icalendar.c
URL:
http://svn.asterisk.org/svn-view/asterisk/team/twilson/calendaring/res/res_icalendar.c?view=diff&rev=197693&r1=197692&r2=197693
==============================================================================
--- team/twilson/calendaring/res/res_icalendar.c (original)
+++ team/twilson/calendaring/res/res_icalendar.c Thu May 28 13:13:51 2009
@@ -332,13 +332,19 @@
ast_log(LOG_ERROR, "You must enable calendar support for res_icalendar to load\n");
return NULL;
}
+ if (ao2_trylock(cal)) {
+ if (cal->unloading) {
+ ast_log(LOG_WARNING, "Unloading module, load_calendar cancelled.\n");
+ } else {
+ ast_log(LOG_WARNING, "Could not lock calendar, aborting!\n");
+ }
+ return NULL;
+ }
if (!(pvt = ao2_alloc(sizeof(*pvt), icalendar_destructor))) {
ast_log(LOG_ERROR, "Could not allocate icalendar_pvt structure for calendar: %s\n", cal->name);
return NULL;
}
-
- ao2_lock(cal);
pvt->owner = cal;
_______________________________________________
--Bandwidth and Colocation Provided by
http://www.api-digital.com--
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
Back to top
Display posts from previous:
All Posts
1 Day
7 Days
2 Weeks
1 Month
3 Months
6 Months
1 Year
Oldest First
Newest First
AsteriskGuru Archives Forum Index
->
Asterisk-CVS
All times are GMT
Page
1
of
1
Jump to:
Select a forum
Asterisk Mailing Lists
----------------
Asterisk-Users
Asterisk-Dev
Asterisk-CVS
Asterisk-Biz
Asterisk-Doc
Asterisk-BSD
Asterisk-Announce
Asterisk Call Centers
Asterisk-Video
Asterisk-Speech-Rec
Bristuff-Users
You
cannot
post new topics in this forum
You
cannot
reply to topics in this forum
You
cannot
edit your posts in this forum
You
cannot
delete your posts in this forum
You
cannot
vote in polls in this forum
Powered by
phpBB
© 2001, 2005 phpBB Group