Fri, 13 Nov 2009 06:10:46 +0500
util.sasl: Allow authzid=username (for compatibility with Smack's non-compliant behavior).
455 | 1 | #!/usr/bin/env lua |
1523
841d61be198f
Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents:
1493
diff
changeset
|
2 | -- Prosody IM |
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 | |
1620
7acb630bdac9
Added: Support for PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables
Waqas Hussain <waqas20@gmail.com>
parents:
1576
diff
changeset
|
12 | CFG_SOURCEDIR=os.getenv("PROSODY_SRCDIR"); |
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"); |
1620
7acb630bdac9
Added: Support for PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables
Waqas Hussain <waqas20@gmail.com>
parents:
1576
diff
changeset
|
14 | CFG_PLUGINDIR=os.getenv("PROSODY_PLUGINDIR"); |
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 | |
1455
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
20 | package.path = CFG_SOURCEDIR.."/?.lua;"..package.path; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
21 | package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath; |
455 | 22 | end |
23 | ||
1455
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
24 | package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua"; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
25 | package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so"; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
26 | |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
27 | 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
|
28 | if os.getenv("HOME") then |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
29 | 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
|
30 | end |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
31 | 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
|
32 | |
455 | 33 | -- 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
|
34 | pcall(require, "luarocks.require") |
2039
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
35 | |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
36 | -- Replace require with one that doesn't pollute _G |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
37 | do |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
38 | local _realG = _G; |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
39 | local _real_require = require; |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
40 | function require(...) |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
41 | local curr_env = getfenv(2); |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
42 | local curr_env_mt = getmetatable(getfenv(2)); |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
43 | local _realG_mt = getmetatable(_realG); |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
44 | if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
45 | local old_newindex |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
46 | old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env; |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
47 | local ret = _real_require(...); |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
48 | _realG_mt.__newindex = old_newindex; |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
49 | return ret; |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
50 | end |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
51 | return _real_require(...); |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
52 | end |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
53 | end |
545c0d6b6bb3
prosody, util.require: Remove util.require, the shortest-lived module so far. Woke up this morning with a much simpler idea, which is also effective against C modules (I believe). Yay for metatables :)
Matthew Wild <mwild1@gmail.com>
parents:
2023
diff
changeset
|
54 | |
455 | 55 | |
433
afbf29498123
Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents:
412
diff
changeset
|
56 | config = require "core.configmanager" |
612
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
57 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
58 | function read_config() |
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 | -- 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
|
60 | -- 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
|
61 | 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
|
62 | if not ok then |
1006
4bd375bde3cb
prosody: Simple whitespace fix in error output
Matthew Wild <mwild1@gmail.com>
parents:
992
diff
changeset
|
63 | print("\n"); |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
64 | print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
65 | if level == "parser" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
66 | 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
|
67 | 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
|
68 | 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
|
69 | print(""); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
70 | elseif level == "file" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
71 | 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
|
72 | 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
|
73 | 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
|
74 | 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
|
75 | end |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
76 | 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
|
77 | print("Good luck!"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
78 | print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
79 | print(""); |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
80 | 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
|
81 | end |
0 | 82 | end |
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
83 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
84 | function load_libraries() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
85 | --- Initialize logging |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
86 | require "core.loggingmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
87 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
88 | --- Check runtime dependencies |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
89 | require "util.dependencies" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
90 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
91 | --- Load socket framework |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
92 | server = require "net.server" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
93 | end |
755
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
94 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
95 | function init_global_state() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
96 | bare_sessions = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
97 | full_sessions = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
98 | hosts = {}; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
99 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
100 | -- Global 'prosody' object |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
101 | prosody = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
102 | local prosody = prosody; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
103 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
104 | prosody.bare_sessions = bare_sessions; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
105 | prosody.full_sessions = full_sessions; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
106 | prosody.hosts = hosts; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
107 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
108 | prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR, |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
109 | plugins = CFG_PLUGINDIR, data = CFG_DATADIR }; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
110 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
111 | prosody.arg = _G.arg; |
1236
eca772495e20
prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents:
1221
diff
changeset
|
112 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
113 | prosody.events = require "util.events".new(); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
114 | |
1789
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
115 | prosody.platform = "unknown"; |
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
116 | if os.getenv("WINDIR") then |
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
117 | prosody.platform = "windows"; |
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
118 | elseif package.config:sub(1,1) == "/" then |
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
119 | prosody.platform = "posix"; |
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
120 | end |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
121 | |
1790
f06688f9b6c6
prosody: Add prosody.installed flag to indicate whether Prosody has been installed or is running from checkout
Matthew Wild <mwild1@gmail.com>
parents:
1789
diff
changeset
|
122 | prosody.installed = nil; |
f06688f9b6c6
prosody: Add prosody.installed flag to indicate whether Prosody has been installed or is running from checkout
Matthew Wild <mwild1@gmail.com>
parents:
1789
diff
changeset
|
123 | if CFG_SOURCEDIR and (prosody.platform == "windows" or CFG_SOURCEDIR:match("^/")) then |
f06688f9b6c6
prosody: Add prosody.installed flag to indicate whether Prosody has been installed or is running from checkout
Matthew Wild <mwild1@gmail.com>
parents:
1789
diff
changeset
|
124 | prosody.installed = true; |
f06688f9b6c6
prosody: Add prosody.installed flag to indicate whether Prosody has been installed or is running from checkout
Matthew Wild <mwild1@gmail.com>
parents:
1789
diff
changeset
|
125 | end |
f06688f9b6c6
prosody: Add prosody.installed flag to indicate whether Prosody has been installed or is running from checkout
Matthew Wild <mwild1@gmail.com>
parents:
1789
diff
changeset
|
126 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
127 | -- Function to reload the config file |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
128 | function prosody.reload_config() |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
129 | log("info", "Reloading configuration file"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
130 | prosody.events.fire_event("reloading-config"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
131 | local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
132 | if not ok then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
133 | if level == "parser" then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
134 | log("error", "There was an error parsing the configuration file: %s", tostring(err)); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
135 | elseif level == "file" then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
136 | log("error", "Couldn't read the config file when trying to reload: %s", tostring(err)); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
137 | end |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
138 | end |
1557
64837ed2d112
prosody: Return success/error from prosody.reload_config()
Matthew Wild <mwild1@gmail.com>
parents:
1532
diff
changeset
|
139 | return ok, (err and tostring(level)..": "..tostring(err)) or nil; |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
140 | end |
1242
6c459c279bbe
Added new prosody.events object
Waqas Hussain <waqas20@gmail.com>
parents:
1239
diff
changeset
|
141 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
142 | -- Function to reopen logfiles |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
143 | function prosody.reopen_logfiles() |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
144 | log("info", "Re-opening log files"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
145 | eventmanager.fire_event("reopen-log-files"); -- Handled by appropriate log sinks |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
146 | prosody.events.fire_event("reopen-log-files"); |
1313
6c7347696caa
prosody: Prefix hg: to changeset ids in the version
Matthew Wild <mwild1@gmail.com>
parents:
1311
diff
changeset
|
147 | end |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
148 | |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
149 | -- Function to initiate prosody shutdown |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
150 | function prosody.shutdown(reason) |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
151 | log("info", "Shutting down: %s", reason or "unknown reason"); |
1561
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
152 | prosody.shutdown_reason = reason; |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
153 | prosody.events.fire_event("server-stopping", {reason = reason}); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
154 | server.setquitting(true); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
155 | end |
1311
fc113027a1d5
prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents:
1298
diff
changeset
|
156 | end |
fc113027a1d5
prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents:
1298
diff
changeset
|
157 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
158 | function read_version() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
159 | -- Try to determine version |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
160 | local version_file = io.open((CFG_SOURCEDIR or ".").."/prosody.version"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
161 | if version_file then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
162 | prosody.version = version_file:read("*a"):gsub("%s*$", ""); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
163 | version_file:close(); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
164 | if #prosody.version == 12 and prosody.version:match("^[a-f0-9]+$") then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
165 | prosody.version = "hg:"..prosody.version; |
1116
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
166 | end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
167 | else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
168 | prosody.version = "unknown"; |
1116
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
169 | end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
170 | end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
171 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
172 | function load_secondary_libraries() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
173 | --- Load and initialise core modules |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
174 | require "util.import" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
175 | require "core.xmlhandlers" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
176 | require "core.rostermanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
177 | require "core.eventmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
178 | require "core.hostmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
179 | require "core.modulemanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
180 | require "core.usermanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
181 | require "core.sessionmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
182 | require "core.stanza_router" |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
183 | |
1967
f78a019efeb0
prosody: Require some core/util libraries which core modules depend upon, C modules and other modules which write to _G
Matthew Wild <mwild1@gmail.com>
parents:
1966
diff
changeset
|
184 | require "net.http" |
f78a019efeb0
prosody: Require some core/util libraries which core modules depend upon, C modules and other modules which write to _G
Matthew Wild <mwild1@gmail.com>
parents:
1966
diff
changeset
|
185 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
186 | require "util.array" |
1967
f78a019efeb0
prosody: Require some core/util libraries which core modules depend upon, C modules and other modules which write to _G
Matthew Wild <mwild1@gmail.com>
parents:
1966
diff
changeset
|
187 | require "util.datetime" |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
188 | require "util.iterators" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
189 | require "util.timer" |
1532
9150aeca9755
prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents:
1530
diff
changeset
|
190 | require "util.helpers" |
9150aeca9755
prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents:
1530
diff
changeset
|
191 | |
1967
f78a019efeb0
prosody: Require some core/util libraries which core modules depend upon, C modules and other modules which write to _G
Matthew Wild <mwild1@gmail.com>
parents:
1966
diff
changeset
|
192 | pcall(require, "util.signal") -- Not on Windows |
f78a019efeb0
prosody: Require some core/util libraries which core modules depend upon, C modules and other modules which write to _G
Matthew Wild <mwild1@gmail.com>
parents:
1966
diff
changeset
|
193 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
194 | -- Commented to protect us from |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
195 | -- the second kind of people |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
196 | --[[ |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
197 | pcall(require, "remdebug.engine"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
198 | if remdebug then remdebug.engine.start() end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
199 | ]] |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
200 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
201 | require "net.connlisteners"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
202 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
203 | require "util.stanza" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
204 | require "util.jid" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
205 | end |
576
c8442d9f02a5
Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
206 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
207 | function init_data_store() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
208 | local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
209 | require "util.datamanager".set_data_path(data_path); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
210 | require "util.datamanager".add_callback(function(username, host, datastore, data) |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
211 | if config.get(host, "core", "anonymous_login") then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
212 | return false; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
213 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
214 | return username, host, datastore, data; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
215 | end); |
1116
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
216 | end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
217 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
218 | function prepare_to_start() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
219 | -- Signal to modules that we are ready to start |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
220 | eventmanager.fire_event("server-starting"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
221 | prosody.events.fire_event("server-starting"); |
133
b92493ea6fd7
Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents:
99
diff
changeset
|
222 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
223 | -- Load SSL settings from config, and create a ctx table |
2023
a3bf6cb12752
prosody: Use rawget to test for the existence of ssl (LuaSec) so we don't look for a nil global
Matthew Wild <mwild1@gmail.com>
parents:
1969
diff
changeset
|
224 | local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl"); |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
225 | if global_ssl_ctx then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
226 | local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; }; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
227 | setmetatable(global_ssl_ctx, { __index = default_ssl_ctx }); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
228 | end |
0 | 229 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
230 | local cl = require "net.connlisteners"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
231 | -- start listening on sockets |
1966
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
232 | function prosody.net_activate_ports(option, listener, default, conntype) |
1583
e17001ce0e9d
prosody: net_activate_ports: Check listener exists before trying to open port for it
Matthew Wild <mwild1@gmail.com>
parents:
1582
diff
changeset
|
233 | if not cl.get(listener) then return; end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
234 | local ports = config.get("*", "core", option.."_ports") or default; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
235 | if type(ports) == "number" then ports = {ports} end; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
236 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
237 | if type(ports) ~= "table" then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
238 | log("error", "core."..option.." is not a table"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
239 | else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
240 | for _, port in ipairs(ports) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
241 | if type(port) ~= "number" then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
242 | log("error", "Non-numeric "..option.."_ports: "..tostring(port)); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
243 | else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
244 | cl.start(listener, { |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
245 | ssl = conntype ~= "tcp" and global_ssl_ctx, |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
246 | port = port, |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
247 | interface = config.get("*", "core", option.."_interface") |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
248 | or cl.get(listener).default_interface |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
249 | or config.get("*", "core", "interface"), |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
250 | type = conntype |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
251 | }); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
252 | end |
605
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
253 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
254 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
255 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
256 | |
1966
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
257 | prosody.net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); |
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
258 | prosody.net_activate_ports("s2s", "xmppserver", {5269}, (global_ssl_ctx and "tls") or "tcp"); |
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
259 | prosody.net_activate_ports("component", "xmppcomponent", {}, "tcp"); |
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
260 | prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl"); |
431866ad1262
prosody: Rename global net_activate_ports -> prosody.net_activate_ports
Matthew Wild <mwild1@gmail.com>
parents:
1894
diff
changeset
|
261 | prosody.net_activate_ports("console", "console", {5582}, "tcp"); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
262 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
263 | prosody.start_time = os.time(); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
264 | end |
382 | 265 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
266 | function init_global_protection() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
267 | -- Catch global accesses -- |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
268 | 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 } |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
269 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
270 | function prosody.unlock_globals() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
271 | setmetatable(_G, nil); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
272 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
273 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
274 | function prosody.lock_globals() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
275 | setmetatable(_G, locked_globals_mt); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
276 | end |
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
|
277 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
278 | -- And lock now... |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
279 | prosody.lock_globals(); |
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
|
280 | 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
|
281 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
282 | function loop() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
283 | -- Error handler for errors that make it this far |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
284 | local function catch_uncaught_error(err) |
2056
ed3910860d11
Prosody top-level error handler modified to log properly on non-string error messages.
Waqas Hussain <waqas20@gmail.com>
parents:
2039
diff
changeset
|
285 | if type(err) == "string" and err:match("%d*: interrupted!$") then |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
286 | return "quitting"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
287 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
288 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
289 | log("error", "Top-level error, please report:\n%s", tostring(err)); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
290 | local traceback = debug.traceback("", 2); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
291 | if traceback then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
292 | log("error", "%s", traceback); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
293 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
294 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
295 | prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback}); |
992
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
296 | end |
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
297 | |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
298 | while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
299 | socket.sleep(0.2); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
300 | end |
992
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
301 | end |
1026
e640df2e4e9b
prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents:
1017
diff
changeset
|
302 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
303 | function cleanup() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
304 | log("info", "Shutdown status: Cleaning up"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
305 | prosody.events.fire_event("server-cleanup"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
306 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
307 | -- Ok, we're quitting I know, but we |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
308 | -- need to do some tidying before we go :) |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
309 | server.setquitting(false); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
310 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
311 | log("info", "Shutdown status: Closing all active sessions"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
312 | for hostname, host in pairs(hosts) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
313 | log("debug", "Shutdown status: Closing client connections for %s", hostname) |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
314 | if host.sessions then |
1561
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
315 | local reason = { condition = "system-shutdown", text = "Server is shutting down" }; |
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
316 | if prosody.shutdown_reason then |
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
317 | reason.text = reason.text..": "..prosody.shutdown_reason; |
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
318 | end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
319 | for username, user in pairs(host.sessions) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
320 | for resource, session in pairs(user.sessions) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
321 | log("debug", "Closing connection for %s@%s/%s", username, hostname, resource); |
1561
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
322 | session:close(reason); |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
323 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
324 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
325 | end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
326 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
327 | log("debug", "Shutdown status: Closing outgoing s2s connections from %s", hostname); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
328 | if host.s2sout then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
329 | for remotehost, session in pairs(host.s2sout) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
330 | if session.close then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
331 | session:close("system-shutdown"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
332 | else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
333 | log("warn", "Unable to close outgoing s2s session to %s, no session:close()?!", remotehost); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
334 | end |
992
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
335 | end |
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
336 | end |
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
337 | end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
338 | |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
339 | log("info", "Shutdown status: Closing all server connections"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
340 | server.closeall(); |
992
3153eff6dae2
prosody: Add prosody_shutdown() function to initiate a server shutdown, add code to gracefully close connections before stopping
Matthew Wild <mwild1@gmail.com>
parents:
978
diff
changeset
|
341 | |
1091
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
342 | server.setquitting(true); |
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
343 | end |
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
344 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
345 | read_config(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
346 | load_libraries(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
347 | init_global_state(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
348 | read_version(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
349 | log("info", "Hello and welcome to Prosody version %s", prosody.version); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
350 | load_secondary_libraries(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
351 | init_data_store(); |
1969
805f548aa57b
prosody: Move global protection earlier (to before modules are loaded, etc.)
Matthew Wild <mwild1@gmail.com>
parents:
1968
diff
changeset
|
352 | init_global_protection(); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
353 | prepare_to_start(); |
1493
42a6a197bed1
prosody: Record time the server started
Matthew Wild <mwild1@gmail.com>
parents:
1455
diff
changeset
|
354 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
355 | eventmanager.fire_event("server-started"); |
1365
864a99eff6d7
Main: Don't use empty event data objects for some global events. Some handlers don't expect it.
Waqas Hussain <waqas20@gmail.com>
parents:
1364
diff
changeset
|
356 | prosody.events.fire_event("server-started"); |
359
8fbfa8f885a6
Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
357 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
358 | loop(); |
853
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
359 | |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
360 | log("info", "Shutting down..."); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
361 | cleanup(); |
1026
e640df2e4e9b
prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents:
1017
diff
changeset
|
362 | eventmanager.fire_event("server-stopped"); |
1365
864a99eff6d7
Main: Don't use empty event data objects for some global events. Some handlers don't expect it.
Waqas Hussain <waqas20@gmail.com>
parents:
1364
diff
changeset
|
363 | prosody.events.fire_event("server-stopped"); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
364 | log("info", "Shutdown complete"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
365 |