prosody
3f34b83771eb
prosody

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

Software / code / prosody

Annotate

prosody @ 648:3f34b83771eb

Return an empty set intead of an error when no disco items are available for a host
author Waqas Hussain <waqas20@gmail.com>
date Fri, 26 Dec 2008 21:46:05 +0500
parent 643:8ff454831f7d
child 658:1952fdcf1017
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
1 #!/usr/bin/env lua
615
4ae3e81513f3 0.1 -> 0.2
Matthew Wild <mwild1@gmail.com>
parents: 612
diff changeset
2 -- Prosody IM v0.2
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
3 -- Copyright (C) 2008 Matthew Wild
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
4 -- Copyright (C) 2008 Waqas Hussain
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
5 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
6 -- This program is free software; you can redistribute it and/or
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
7 -- modify it under the terms of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
8 -- as published by the Free Software Foundation; either version 2
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
9 -- of the License, or (at your option) any later version.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
10 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
11 -- This program is distributed in the hope that it will be useful,
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
12 -- but WITHOUT ANY WARRANTY; without even the implied warranty of
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
13 -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
14 -- GNU General Public License for more details.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
15 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
16 -- You should have received a copy of the GNU General Public License
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
17 -- along with this program; if not, write to the Free Software
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
18 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
19 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
20
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
21 -- Config here --
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
22
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
23 CFG_SOURCEDIR=nil;
523
c0f15538f358 config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents: 502
diff changeset
24 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
25 CFG_PLUGINDIR=nil;
523
c0f15538f358 config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents: 502
diff changeset
26 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
27
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
28 -- -- -- -- -- --
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
29
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
30 if CFG_SOURCEDIR then
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
31 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
32 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
33 end
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
34
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
35 if CFG_DATADIR then
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
36 if os.getenv("HOME") then
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
37 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
38 end
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
39 end
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
40
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
41 -- Required to be able to find packages installed with luarocks
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
42 pcall(require, "luarocks.require")
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
43
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
44
433
afbf29498123 Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents: 412
diff changeset
45 config = require "core.configmanager"
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
46 log = require "util.logger".init("general");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
47
612
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
48 -- Disable log output, needs to read from config
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
49 -- require "util.logger".setwriter(function () end);
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
50
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
51 do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
52 -- TODO: Check for other formats when we add support for them
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
53 -- Use lfs? Make a new conf/ dir?
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
54 local ok, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
55 if not ok then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
56 log("error", "Couldn't load config file: %s", err);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
57 log("info", "Falling back to old config file format...")
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
58 ok, err = pcall(dofile, "lxmppd.cfg");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
59 if not ok then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
60 log("error", "Old config format loading failed too: %s", err);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
61 else
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
62 for _, host in ipairs(_G.config.hosts) do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
63 config.set(host, "core", "defined", true);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
64 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
65
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
66 config.set("*", "core", "modules_enabled", _G.config.modules);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
67 config.set("*", "core", "ssl", _G.config.ssl_ctx);
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
68 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
69 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
70 end
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
71
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
72 local server = require "net.server"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
73
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
74 require "util.dependencies"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
75
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
76 -- Maps connections to sessions --
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
77 sessions = {};
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
78 hosts = {};
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
79
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
80 -- Load and initialise core modules --
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
81
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
82 require "util.import"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
83 require "core.xmlhandlers"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
84 require "core.rostermanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
85 require "core.offlinemessage"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
86 require "core.eventmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
87 require "core.hostmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
88 require "core.modulemanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
89 require "core.usermanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
90 require "core.sessionmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
91 require "core.stanza_router"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
92
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
93 --[[
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
94 pcall(require, "remdebug.engine");
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
95 if remdebug then remdebug.engine.start() end
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
96 ]]
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
97
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
98 local cl = require "net.connlisteners";
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
99
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
100 require "util.stanza"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
101 require "util.jid"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
102
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
103 ------------------------------------------------------------------------
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
104
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
105
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
106 ------------- Begin code without a home ---------------------
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
107
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
108 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
109 require "util.datamanager".set_data_path(data_path);
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
110
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
111 ----------- End of out-of-place code --------------
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
112
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
113 eventmanager.fire_event("server-starting");
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
114
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
115
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
116 -- setup error handling
580
9ff2c3c87065 Some code cleaning for the main script
Matthew Wild <mwild1@gmail.com>
parents: 576
diff changeset
117 setmetatable(_G, { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end });
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
118
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
119 local global_ssl_ctx = config.get("*", "core", "ssl");
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
120 if global_ssl_ctx then
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
121 local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
122 setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
123 end
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
124
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
125 -- start listening on sockets
605
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
126 local function do_ports(option, listener, default, key)
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
127 local ports = config.get("*", "core", option) or default;
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
128 --if type(ports) == "number" then ports = {ports} end;
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
129 if type(ports) ~= "table" then
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
130 log("error", "core."..option.." is not a table");
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
131 else
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
132 for _, port in ipairs(ports) do
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
133 if type(port) ~= "number" then
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
134 log("error", "Non-numeric "..option..": "..tostring(port));
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
135 else
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
136 cl.start(listener, { ssl = global_ssl_ctx, [key] = port });
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
137 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
138 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
139 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
140 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
141
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
142 do_ports("c2s_ports", "xmppclient", {5222}, "port");
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
143 do_ports("s2s_ports", "xmppserver", {5269}, "port");
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
144 do_ports("legacy_ssl_ports", "xmppclient", {}, "legacy_ssl_port");
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
145
383
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
146 if config.get("*", "core", "console_enabled") then
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
147 if cl.get("console") then
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
148 cl.start("console")
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
149 else
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
150 log("error", "Console is enabled, but the console module appears not to be loaded");
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
151 end
383
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
152 end
382
9daf1e3d278e Add initial mod_console
Matthew Wild <mwild1@gmail.com>
parents: 381
diff changeset
153
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
154 eventmanager.fire_event("server-started");
359
8fbfa8f885a6 Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents: 260
diff changeset
155
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
156 server.loop();