prosody
dcc8e789df36
prosodyctl

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

Software / code / prosody

Comparison

prosodyctl @ 5023:dcc8e789df36

mod_admin_telnet, prosody, prosodyctl, ejabberd2prosody: Don't depend on modules setting globals
author Florian Zeitz <florob@babelmonkeys.de>
date Sat, 09 Jun 2012 02:27:44 +0200
parent 4881:eafed1728be3
child 5024:d25e1b9332cc
comparison
equal deleted inserted replaced
5022:776a57ca0d84 5023:dcc8e789df36
225 225
226 for hostname, config in pairs(config.getconfig()) do 226 for hostname, config in pairs(config.getconfig()) do
227 hosts[hostname] = make_host(hostname); 227 hosts[hostname] = make_host(hostname);
228 end 228 end
229 229
230 require "core.modulemanager" 230 local modulemanager = require "core.modulemanager"
231 231
232 require "util.prosodyctl" 232 local prosodyctl = require "util.prosodyctl"
233 require "socket" 233 require "socket"
234 ----------------------- 234 -----------------------
235 235
236 -- FIXME: Duplicate code waiting for util.startup 236 -- FIXME: Duplicate code waiting for util.startup
237 function read_version() 237 function read_version()
507 if arg[1] == "--help" then 507 if arg[1] == "--help" then
508 show_usage([[about]], [[Show information about this Prosody installation]]); 508 show_usage([[about]], [[Show information about this Prosody installation]]);
509 return 1; 509 return 1;
510 end 510 end
511 511
512 require "util.array"; 512 local array = require "util.array";
513 local keys = require "util.iterators".keys; 513 local keys = require "util.iterators".keys;
514 514
515 print("Prosody "..(prosody.version or "(unknown version)")); 515 print("Prosody "..(prosody.version or "(unknown version)"));
516 print(""); 516 print("");
517 print("# Prosody directories"); 517 print("# Prosody directories");