util/startup.lua
changeset 10112 659ffa03f1e7
parent 9882 dd61201fc5af
child 10214 9fdda9fafc3c
equal deleted inserted replaced
10111:1dbabbebb53c 10112:659ffa03f1e7
   249 		log("info", "Reloading configuration file");
   249 		log("info", "Reloading configuration file");
   250 		prosody.events.fire_event("reloading-config");
   250 		prosody.events.fire_event("reloading-config");
   251 		local ok, level, err = config.load(prosody.config_file);
   251 		local ok, level, err = config.load(prosody.config_file);
   252 		if not ok then
   252 		if not ok then
   253 			if level == "parser" then
   253 			if level == "parser" then
   254 				log("error", "There was an error parsing the configuration file: %s", tostring(err));
   254 				log("error", "There was an error parsing the configuration file: %s", err);
   255 			elseif level == "file" then
   255 			elseif level == "file" then
   256 				log("error", "Couldn't read the config file when trying to reload: %s", tostring(err));
   256 				log("error", "Couldn't read the config file when trying to reload: %s", err);
   257 			end
   257 			end
   258 		else
   258 		else
   259 			prosody.events.fire_event("config-reloaded", {
   259 			prosody.events.fire_event("config-reloaded", {
   260 				filename = prosody.config_file,
   260 				filename = prosody.config_file,
   261 				config = config.getconfig(),
   261 				config = config.getconfig(),