Comparison

plugins/mod_console.lua @ 475:fe861de7a4fc

Forced merge.
author Tobias Markmann <tm@ayena.de>
date Sat, 29 Nov 2008 11:24:59 +0100
parent 461:8e66201f566a
child 519:cccd610a0ef9
comparison
equal deleted inserted replaced
474:666e22848890 475:fe861de7a4fc
122 -- Session environment -- 122 -- Session environment --
123 -- Anything in def_env will be accessible within the session as a global variable 123 -- Anything in def_env will be accessible within the session as a global variable
124 124
125 def_env.server = {}; 125 def_env.server = {};
126 function def_env.server:reload() 126 function def_env.server:reload()
127 dofile "main.lua" 127 dofile "prosody"
128 return true, "Server reloaded"; 128 return true, "Server reloaded";
129 end 129 end
130 130
131 def_env.module = {}; 131 def_env.module = {};
132 function def_env.module:load(name, host, config) 132 function def_env.module:load(name, host, config)