prosody
19381ed1cc02
net/server.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

net/server.lua @ 5285:19381ed1cc02

Merge 0.9->trunk
author Kim Alvefur <zash@zash.se>
date Sat, 29 Dec 2012 19:13:42 +0100 (2012-12-29)
parent 5284:5d2282a29387
child 5383:143670deee3e
comparison
equal deleted inserted replaced
5283:a3a4de5104ee 5285:19381ed1cc02
60 }; 60 };
61 61
62 for k, v in pairs(event_settings) do 62 for k, v in pairs(event_settings) do
63 server.cfg[k] = v; 63 server.cfg[k] = v;
64 end 64 end
65 return true;
66 else 65 else
67 return server.changesettings(settings); 66 server.changesettings(settings);
68 end 67 end
69 end 68 end
70 load_config(); 69 load_config();
71 prosody.events.add_handler("config-reloaded", load_config); 70 prosody.events.add_handler("config-reloaded", load_config);
72 end 71 end