author | Matthew Wild <mwild1@gmail.com> |
Tue, 31 Mar 2009 02:18:13 +0100 | |
changeset 943 | 7f161205121d |
parent 942 | dae54304967d |
child 972 | 144d0ad17389 |
permissions | -rwxr-xr-x |
455 | 1 |
#!/usr/bin/env lua |
896 | 2 |
-- Prosody IM v0.4 |
761
67ec69001fd7
Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents:
755
diff
changeset
|
3 |
-- Copyright (C) 2008-2009 Matthew Wild |
67ec69001fd7
Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents:
755
diff
changeset
|
4 |
-- Copyright (C) 2008-2009 Waqas Hussain |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
5 |
-- |
761
67ec69001fd7
Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents:
755
diff
changeset
|
6 |
-- This project is MIT/X11 licensed. Please see the |
67ec69001fd7
Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents:
755
diff
changeset
|
7 |
-- COPYING file in the source package for more information. |
519
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
8 |
-- |
cccd610a0ef9
Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents:
502
diff
changeset
|
9 |
|
843
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
10 |
-- Will be modified by configure script if run -- |
455 | 11 |
|
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
|
12 |
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
|
13 |
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
|
14 |
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
|
15 |
CFG_DATADIR=os.getenv("PROSODY_DATADIR"); |
455 | 16 |
|
843
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
17 |
-- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- -- |
455 | 18 |
|
19 |
if CFG_SOURCEDIR then |
|
20 |
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
|
21 |
package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath |
455 | 22 |
end |
23 |
||
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
24 |
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
|
25 |
if os.getenv("HOME") then |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
26 |
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
|
27 |
end |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
28 |
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
|
29 |
|
455 | 30 |
-- 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
|
31 |
pcall(require, "luarocks.require") |
0 | 32 |
|
455 | 33 |
|
433
afbf29498123
Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents:
412
diff
changeset
|
34 |
config = require "core.configmanager" |
612
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
35 |
|
376
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
36 |
do |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
37 |
-- 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
|
38 |
-- Use lfs? Make a new conf/ dir? |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
39 |
local ok, level, 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
|
40 |
if not ok then |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
41 |
print(""); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
42 |
print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
43 |
if level == "parser" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
44 |
print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
45 |
local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
46 |
print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err))); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
47 |
print(""); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
48 |
elseif level == "file" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
49 |
print("Prosody was unable to find the configuration file."); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
50 |
print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
51 |
print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist"); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
52 |
print("Copy or rename it to prosody.cfg.lua and edit as necessary."); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
53 |
end |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
54 |
print("More help on configuring Prosody can be found at http://prosody.im/doc/configure"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
55 |
print("Good luck!"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
56 |
print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
57 |
print(""); |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
58 |
os.exit(1); |
376
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
59 |
end |
0 | 60 |
end |
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
61 |
|
882
e362bafbbb68
prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents:
853
diff
changeset
|
62 |
log = require "util.logger".init("general"); |
e362bafbbb68
prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents:
853
diff
changeset
|
63 |
|
e362bafbbb68
prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents:
853
diff
changeset
|
64 |
-- Disable log output, needs to read from config |
e362bafbbb68
prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents:
853
diff
changeset
|
65 |
-- require "util.logger".setwriter(function () end); |
e362bafbbb68
prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents:
853
diff
changeset
|
66 |
|
755
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
67 |
require "util.dependencies" |
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
68 |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
69 |
local server = require "net.server" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
70 |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
71 |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
72 |
-- Maps connections to sessions -- |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
73 |
sessions = {}; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
74 |
hosts = {}; |
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 |
-- Load and initialise core modules -- |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
77 |
|
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
78 |
require "util.import" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
79 |
require "core.xmlhandlers" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
80 |
require "core.rostermanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
81 |
require "core.eventmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
82 |
require "core.hostmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
83 |
require "core.modulemanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
84 |
require "core.usermanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
85 |
require "core.sessionmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
86 |
require "core.stanza_router" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
87 |
|
942
dae54304967d
Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents:
941
diff
changeset
|
88 |
require "util.array" |
dae54304967d
Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents:
941
diff
changeset
|
89 |
require "util.iterators" |
dae54304967d
Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents:
941
diff
changeset
|
90 |
|
843
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
91 |
-- Commented to protect us from |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
92 |
-- the second kind of people |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
93 |
--[[ |
569
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); |
933
2a5352e0e10e
Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents:
907
diff
changeset
|
110 |
require "util.datamanager".set_callback(function(username, host, datastore) |
2a5352e0e10e
Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents:
907
diff
changeset
|
111 |
return config.get(host, "core", "anonymous_login"); |
2a5352e0e10e
Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents:
907
diff
changeset
|
112 |
end); |
576
c8442d9f02a5
Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
113 |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
114 |
----------- End of out-of-place code -------------- |
99
ba08b8a4eeef
Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
115 |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
116 |
eventmanager.fire_event("server-starting"); |
133
b92493ea6fd7
Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents:
99
diff
changeset
|
117 |
|
940
776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents:
907
diff
changeset
|
118 |
local global_ssl_ctx = config.get("*", "core", "ssl"); |
776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents:
907
diff
changeset
|
119 |
if global_ssl_ctx then |
776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents:
907
diff
changeset
|
120 |
local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; }; |
776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents:
907
diff
changeset
|
121 |
setmetatable(global_ssl_ctx, { __index = default_ssl_ctx }); |
776cb8c847c5
Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents:
907
diff
changeset
|
122 |
end |
0 | 123 |
|
218
1263896ab2f1
Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents:
207
diff
changeset
|
124 |
-- start listening on sockets |
907
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
125 |
function net_activate_ports(option, listener, default, conntype) |
605
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
126 |
local ports = config.get("*", "core", option) or default; |
906
0831db62f134
prosody: Allow ports to be specified as just numbers
Matthew Wild <mwild1@gmail.com>
parents:
896
diff
changeset
|
127 |
if type(ports) == "number" then ports = {ports} end; |
658
1952fdcf1017
Fix specifying ports in config, and SSL support
Matthew Wild <mwild1@gmail.com>
parents:
643
diff
changeset
|
128 |
|
605
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 |
739
1def06cd9311
Port to new server.lua, quite some changes, but I believe everything to be working
Matthew Wild <mwild1@gmail.com>
parents:
687
diff
changeset
|
136 |
cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype }); |
605
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 |
|
907
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
142 |
net_activate_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); |
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
143 |
net_activate_ports("s2s_ports", "xmppserver", {5269}, "tcp"); |
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
144 |
net_activate_ports("legacy_ssl_ports", "xmppclient", {}, "ssl"); |
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 |
676
5e2dfeba1f14
Default mod_console to listening on localhost only. May be changed with console_interface=xxx.xxx.xxx.xxx in the config
Matthew Wild <mwild1@gmail.com>
parents:
664
diff
changeset
|
148 |
cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) |
569
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 | 153 |
|
907
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
154 |
-- setup error handling |
943
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
155 |
local locked_globals_mt = { __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 } |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
156 |
|
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
157 |
function unlock_globals() |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
158 |
setmetatable(_G, nil); |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
159 |
end |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
160 |
|
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
161 |
function lock_globals() |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
162 |
setmetatable(_G, locked_globals_mt); |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
163 |
end |
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
164 |
|
7f161205121d
Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents:
942
diff
changeset
|
165 |
lock_globals(); |
907
289388b79a83
prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents:
906
diff
changeset
|
166 |
|
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
167 |
eventmanager.fire_event("server-started"); |
359
8fbfa8f885a6
Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
168 |
|
843
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
169 |
local quitting; |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
170 |
while not quitting do |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
171 |
xpcall(server.loop, function (err) |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
172 |
if err:match("%d*: interrupted!$") then |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
173 |
quitting = true; |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
174 |
return; |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
175 |
end |
853
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
176 |
|
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
177 |
log("error", "Top-level error, please report:\n%s", tostring(err)); |
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
178 |
|
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
179 |
local traceback = debug.traceback("", 2); |
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
180 |
if traceback then |
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
181 |
log("error", "%s", traceback); |
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
182 |
end |
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
183 |
|
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
184 |
eventmanager.fire_event("very-bad-error", "*", err, traceback); |
843
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
185 |
end); |
1d2dab41b0db
prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents:
793
diff
changeset
|
186 |
end |