mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-10-31 02:37:10 +00:00 
			
		
		
		
	Reload must react correctly against a possibly changed table, so dropping the conditional reload flag.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@312286 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
		| @@ -428,7 +428,7 @@ static int my_load_module(int reload) | ||||
| 	int res; | ||||
| 	struct ast_config *cfg; | ||||
| 	struct ast_variable *var; | ||||
| 	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; | ||||
| 	struct ast_flags config_flags = { 0 }; | ||||
| 	struct column *entry; | ||||
| 	char *temp; | ||||
| 	struct ast_str *compat; | ||||
| @@ -439,6 +439,9 @@ static int my_load_module(int reload) | ||||
| 	my_bool my_bool_true = 1; | ||||
| #endif | ||||
|  | ||||
| 	/* Cannot use a conditionally different flag, because the table layout may | ||||
| 	 * have changed, which is not detectable by config file change detection, | ||||
| 	 * but should still cause the configuration to be re-parsed. */ | ||||
| 	cfg = ast_config_load(config, config_flags); | ||||
| 	if (!cfg) { | ||||
| 		ast_log(LOG_WARNING, "Unable to load config for mysql CDR's: %s\n", config); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user