[asterisk-commits] mjordan: trunk r393589 - /trunk/main/stasis_config.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Wed Jul  3 16:14:03 2013
New Revision: 393589

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=393589
Log:
Let Stasis load itself with default values

While a Stasis configuration file is nice, it shouldn't be mandatory.
We can carry on with default values.

Modified:
    trunk/main/stasis_config.c

Modified: trunk/main/stasis_config.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_config.c?view=diff&rev=393589&r1=393588&r2=393589
==============================================================================
--- trunk/main/stasis_config.c (original)
+++ trunk/main/stasis_config.c Wed Jul  3 16:14:03 2013
@@ -150,13 +150,20 @@
 /*! \brief Load (or reload) configuration. */
 static int process_config(int reload)
 {
-        switch (aco_process_config(&cfg_info, reload)) {
-        case ACO_PROCESS_ERROR:
-                return -1;
-        case ACO_PROCESS_OK:
-        case ACO_PROCESS_UNCHANGED:
-                break;
-        }
+	RAII_VAR(struct stasis_conf *, conf, conf_alloc(), ao2_cleanup);
+
+		switch (aco_process_config(&cfg_info, reload)) {
+		case ACO_PROCESS_ERROR:
+			if (conf && !reload && !aco_set_defaults(&threadpool_option, "threadpool", conf->threadpool)) {
+				ast_log(AST_LOG_NOTICE, "Failed to process Stasis configuration; using defaults\n");
+				ao2_global_obj_replace(confs, conf);
+				return 0;
+			}
+			return -1;
+		case ACO_PROCESS_OK:
+		case ACO_PROCESS_UNCHANGED:
+			break;
+		}
 
 	return 0;
 }