[asterisk-commits] branch oej/multiparking - r8116 in /team/oej/multiparking: ./ asterisk.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Jan 16 20:54:54 2006
New Revision: 8116

URL: http://svn.digium.com/view/asterisk?rev=8116&view=rev
Log:
Merged revisions 8113-8114 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r8113 | kpfleming | 2006-01-17 00:52:02 +0100 (Tue, 17 Jan 2006) | 2 lines

block this revision, fix is different in this branch

........
r8114 | kpfleming | 2006-01-17 00:52:51 +0100 (Tue, 17 Jan 2006) | 2 lines

check rlimit _after_ reading config file, so that if 'dumpcore' is specified there it will take effect

........

Modified:
    team/oej/multiparking/   (props changed)
    team/oej/multiparking/asterisk.c

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-blocked (original)
+++ svnmerge-blocked Mon Jan 16 20:54:54 2006
@@ -1,1 +1,1 @@
-/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047
+/branches/1.2:7490,7497,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7915,7960,7965,7970,7976,8047,8112

Propchange: team/oej/multiparking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jan 16 20:54:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-8110
+/trunk:1-8115

Modified: team/oej/multiparking/asterisk.c
URL: http://svn.digium.com/view/asterisk/team/oej/multiparking/asterisk.c?rev=8116&r1=8115&r2=8116&view=diff
==============================================================================
--- team/oej/multiparking/asterisk.c (original)
+++ team/oej/multiparking/asterisk.c Mon Jan 16 20:54:54 2006
@@ -2129,6 +2129,10 @@
 		}
 	}
 
+	if (ast_opt_console && !option_verbose) 
+		ast_verbose("[ Reading Master Configuration ]");
+	ast_readconfig();
+
 	if (ast_opt_dump_core) {
 		struct rlimit l;
 		memset(&l, 0, sizeof(l));
@@ -2138,10 +2142,6 @@
 			ast_log(LOG_WARNING, "Unable to disable core size resource limit: %s\n", strerror(errno));
 		}
 	}
-
-	if (ast_opt_console && !option_verbose) 
-		ast_verbose("[ Reading Master Configuration ]");
-	ast_readconfig();
 
 	if ((!rungroup) && !ast_strlen_zero(ast_config_AST_RUN_GROUP))
 		rungroup = ast_config_AST_RUN_GROUP;