Mercurial > prosody-hg
comparison plugins/mod_admin_adhoc.lua @ 4956:bc26e6d519ae
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 19 Jul 2012 15:36:31 +0100 |
| parents | 212e81ac6ebb 4f1b6a4784f9 |
| children | 5243b74a4cbb |
comparison
equal
deleted
inserted
replaced
| 4953:24c2150cc8b0 | 4956:bc26e6d519ae |
|---|---|
| 467 else | 467 else |
| 468 return { status = "completed", error = { message = 'Failed to load module "'..fields.module..'" on host "'..data.to.. | 468 return { status = "completed", error = { message = 'Failed to load module "'..fields.module..'" on host "'..data.to.. |
| 469 '". Error was: "'..tostring(err or "<unspecified>")..'"' } }; | 469 '". Error was: "'..tostring(err or "<unspecified>")..'"' } }; |
| 470 end | 470 end |
| 471 else | 471 else |
| 472 local modules = array.collect(keys(hosts[data.to].modules)):sort(); | |
| 473 return { status = "executing", form = layout }, "executing"; | 472 return { status = "executing", form = layout }, "executing"; |
| 474 end | 473 end |
| 475 end | 474 end |
| 476 | 475 |
| 477 function reload_modules_handler(self, data, state) | 476 function reload_modules_handler(self, data, state) |
