Software /
code /
prosody
Annotate
prosody @ 2565:a0d22b6a3144
prosody: Initialize logging before checking dependencies (fixes another traceback with no LuaSec)
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Fri, 05 Feb 2010 14:32:20 +0000 |
parent | 2553:c3afa1e02e8f |
child | 2567:ca6ee2dac8d6 |
rev | line source |
---|---|
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 |
2147
119323e35c32
Mainfile: Fixed some comments.
Waqas Hussain <waqas20@gmail.com>
parents:
2087
diff
changeset
|
17 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- |
455 | 18 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
19 -- Tell Lua where to find our libraries |
455 | 20 if CFG_SOURCEDIR then |
1455
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
21 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
22 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath; |
455 | 23 end |
24 | |
1455
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
25 package.path = package.path..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.lua"; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
26 package.cpath = package.cpath..";"..(CFG_SOURCEDIR or ".").."/fallbacks/?.so"; |
81e01809de54
prosody: Add fallbacks/ to path
Matthew Wild <mwild1@gmail.com>
parents:
1382
diff
changeset
|
27 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
28 -- Substitute ~ with path to home directory in data path |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
29 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
|
30 if os.getenv("HOME") then |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
31 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
|
32 end |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
33 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
|
34 |
2565
a0d22b6a3144
prosody: Initialize logging before checking dependencies (fixes another traceback with no LuaSec)
Matthew Wild <mwild1@gmail.com>
parents:
2553
diff
changeset
|
35 -- Initialize logging |
a0d22b6a3144
prosody: Initialize logging before checking dependencies (fixes another traceback with no LuaSec)
Matthew Wild <mwild1@gmail.com>
parents:
2553
diff
changeset
|
36 require "core.loggingmanager" |
a0d22b6a3144
prosody: Initialize logging before checking dependencies (fixes another traceback with no LuaSec)
Matthew Wild <mwild1@gmail.com>
parents:
2553
diff
changeset
|
37 |
2514
163b2aef5aff
prosody: Check dependencies (and load LuaRocks) earlier on in the startup process
Matthew Wild <mwild1@gmail.com>
parents:
2510
diff
changeset
|
38 -- Check runtime dependencies |
163b2aef5aff
prosody: Check dependencies (and load LuaRocks) earlier on in the startup process
Matthew Wild <mwild1@gmail.com>
parents:
2510
diff
changeset
|
39 if not require "util.dependencies".check_dependencies() then |
163b2aef5aff
prosody: Check dependencies (and load LuaRocks) earlier on in the startup process
Matthew Wild <mwild1@gmail.com>
parents:
2510
diff
changeset
|
40 os.exit(1); |
163b2aef5aff
prosody: Check dependencies (and load LuaRocks) earlier on in the startup process
Matthew Wild <mwild1@gmail.com>
parents:
2510
diff
changeset
|
41 end |
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
|
42 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
43 -- Replace require() with one that doesn't pollute _G, required |
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
44 -- for neat sandboxing of modules |
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
|
45 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
|
46 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
|
47 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
|
48 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
|
49 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
|
50 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
|
51 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
|
52 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
|
53 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
|
54 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
|
55 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
|
56 _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
|
57 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
|
58 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
|
59 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
|
60 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
|
61 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
|
62 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
63 -- Load the config-parsing module |
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
64 config = require "core.configmanager" |
455 | 65 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
66 -- -- -- -- |
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
67 -- Define the functions we call during startup, the |
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
68 -- actual startup happens right at the end, where these |
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
69 -- functions get called |
612
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
70 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
71 function read_config() |
2154
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
72 local filenames = {}; |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
73 |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
74 local filename; |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
75 if arg[1] == "--config" and arg[2] then |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
76 table.insert(filenames, arg[2]); |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
77 if CFG_CONFIGDIR then |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
78 table.insert(filenames, CFG_CONFIGDIR.."/"..arg[2]); |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
79 end |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
80 else |
2428
3ba9db4b9311
prosody: Read list of possible config extensions from configmanager, removes old TODO
Matthew Wild <mwild1@gmail.com>
parents:
2365
diff
changeset
|
81 for _, format in ipairs(config.parsers()) do |
3ba9db4b9311
prosody: Read list of possible config extensions from configmanager, removes old TODO
Matthew Wild <mwild1@gmail.com>
parents:
2365
diff
changeset
|
82 table.insert(filenames, (CFG_CONFIGDIR or ".").."/prosody.cfg."..format); |
3ba9db4b9311
prosody: Read list of possible config extensions from configmanager, removes old TODO
Matthew Wild <mwild1@gmail.com>
parents:
2365
diff
changeset
|
83 end |
2154
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
84 end |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
85 for _,_filename in ipairs(filenames) do |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
86 filename = _filename; |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
87 local file = io.open(filename); |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
88 if file then |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
89 file:close(); |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
90 CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$"); |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
91 break; |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
92 end |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
93 end |
b8635ebd7f57
prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents:
2147
diff
changeset
|
94 local ok, level, err = config.load(filename); |
376
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
95 if not ok then |
1001
4bd375bde3cb
prosody: Simple whitespace fix in error output
Matthew Wild <mwild1@gmail.com>
parents:
992
diff
changeset
|
96 print("\n"); |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
97 print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
98 if level == "parser" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
99 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
|
100 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
|
101 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
|
102 print(""); |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
103 elseif level == "file" then |
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
104 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
|
105 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
|
106 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
|
107 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
|
108 end |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
109 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
|
110 print("Good luck!"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
111 print("**************************"); |
793
55add3b87c01
Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents:
761
diff
changeset
|
112 print(""); |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
113 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
|
114 end |
0 | 115 end |
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
116 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
117 function load_libraries() |
2147
119323e35c32
Mainfile: Fixed some comments.
Waqas Hussain <waqas20@gmail.com>
parents:
2087
diff
changeset
|
118 -- Load socket framework |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
119 server = require "net.server" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
120 end |
755
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
121 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
122 function init_global_state() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
123 bare_sessions = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
124 full_sessions = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
125 hosts = {}; |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
126 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
127 -- Global 'prosody' object |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
128 prosody = {}; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
129 local prosody = prosody; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
130 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
131 prosody.bare_sessions = bare_sessions; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
132 prosody.full_sessions = full_sessions; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
133 prosody.hosts = hosts; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
134 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
135 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
|
136 plugins = CFG_PLUGINDIR, data = CFG_DATADIR }; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
137 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
138 prosody.arg = _G.arg; |
1236
eca772495e20
prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents:
1221
diff
changeset
|
139 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
140 prosody.events = require "util.events".new(); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
141 |
1789
23a66fdf541e
prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents:
1622
diff
changeset
|
142 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
|
143 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
|
144 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
|
145 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
|
146 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
|
147 end |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
148 |
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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
154 -- Function to reload the config file |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
155 function prosody.reload_config() |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
156 log("info", "Reloading configuration file"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
157 prosody.events.fire_event("reloading-config"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
158 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
|
159 if not ok then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
160 if level == "parser" then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
161 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
|
162 elseif level == "file" then |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
163 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
|
164 end |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
165 end |
1557
64837ed2d112
prosody: Return success/error from prosody.reload_config()
Matthew Wild <mwild1@gmail.com>
parents:
1532
diff
changeset
|
166 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
|
167 end |
1242
6c459c279bbe
Added new prosody.events object
Waqas Hussain <waqas20@gmail.com>
parents:
1239
diff
changeset
|
168 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
169 -- Function to reopen logfiles |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
170 function prosody.reopen_logfiles() |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
171 log("info", "Re-opening log files"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
172 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
|
173 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
|
174 end |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
175 |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
176 -- Function to initiate prosody shutdown |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
177 function prosody.shutdown(reason) |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
178 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
|
179 prosody.shutdown_reason = reason; |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
180 prosody.events.fire_event("server-stopping", {reason = reason}); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
181 server.setquitting(true); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
182 end |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
183 |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
184 -- Load SSL settings from config, and create a ctx table |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
185 local global_ssl_ctx = rawget(_G, "ssl") and config.get("*", "core", "ssl"); |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
186 if global_ssl_ctx then |
2346
f5c8f727b2a9
Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents:
2341
diff
changeset
|
187 local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none", options = "no_sslv2" }; |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
188 setmetatable(global_ssl_ctx, { __index = default_ssl_ctx }); |
2322
548a4fc54a74
prosody: Expose global_ssl_ctx through prosody object
Matthew Wild <mwild1@gmail.com>
parents:
2321
diff
changeset
|
189 prosody.global_ssl_ctx = global_ssl_ctx; |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
190 end |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
191 |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
192 local cl = require "net.connlisteners"; |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
193 function prosody.net_activate_ports(option, listener, default, conntype) |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
194 conntype = conntype or (global_ssl_ctx and "tls") or "tcp"; |
2364
b79e5ba69704
prosody: Fix to net_activate_ports to mend binding to specific interfaces
Paul Aurich <paul@darkrain42.org>
parents:
2362
diff
changeset
|
195 local ports_option = option and option.."_ports" or "ports"; |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
196 if not cl.get(listener) then return; end |
2364
b79e5ba69704
prosody: Fix to net_activate_ports to mend binding to specific interfaces
Paul Aurich <paul@darkrain42.org>
parents:
2362
diff
changeset
|
197 local ports = config.get("*", "core", ports_option) or default; |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
198 if type(ports) == "number" then ports = {ports} end; |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
199 |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
200 if type(ports) ~= "table" then |
2364
b79e5ba69704
prosody: Fix to net_activate_ports to mend binding to specific interfaces
Paul Aurich <paul@darkrain42.org>
parents:
2362
diff
changeset
|
201 log("error", "core."..ports_option.." is not a table"); |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
202 else |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
203 for _, port in ipairs(ports) do |
2429
5cfa1400e247
prosody: net_activate_ports: Accept strings as well as numbers for specifying ports
Matthew Wild <mwild1@gmail.com>
parents:
2428
diff
changeset
|
204 port = tonumber(port); |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
205 if type(port) ~= "number" then |
2364
b79e5ba69704
prosody: Fix to net_activate_ports to mend binding to specific interfaces
Paul Aurich <paul@darkrain42.org>
parents:
2362
diff
changeset
|
206 log("error", "Non-numeric "..ports_option..": "..tostring(port)); |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
207 else |
2550
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
208 local ok, err = cl.start(listener, { |
2548
e12acef85166
prosody: Only set the ssl_ctx for 'ssl' connections
Matthew Wild <mwild1@gmail.com>
parents:
2514
diff
changeset
|
209 ssl = conntype == "ssl" and global_ssl_ctx, |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
210 port = port, |
2365
0bd8408a491c
prosody: Fixed a possible nil concatenation.
Waqas Hussain <waqas20@gmail.com>
parents:
2364
diff
changeset
|
211 interface = (option and config.get("*", "core", option.."_interface")) |
0bd8408a491c
prosody: Fixed a possible nil concatenation.
Waqas Hussain <waqas20@gmail.com>
parents:
2364
diff
changeset
|
212 or cl.get(listener).default_interface |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
213 or config.get("*", "core", "interface"), |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
214 type = conntype |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
215 }); |
2550
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
216 if not ok then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
217 local friendly_message = err; |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
218 if err:match(" in use") then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
219 if port == 5222 or port == 5223 or port == 5269 then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
220 friendly_message = "check that Prosody or another XMPP server is " |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
221 .."not already running and using this port"; |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
222 elseif port == 80 or port == 81 then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
223 friendly_message = "check that a HTTP server is not already using " |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
224 .."this port"; |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
225 elseif port == 5280 then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
226 friendly_message = "check that Prosody or a BOSH connection manager " |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
227 .."is not already running"; |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
228 end |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
229 elseif err:match("permission") then |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
230 friendly_message = "Prosody does not have sufficient privileges to use this port"; |
2553
c3afa1e02e8f
prosody: Show friendly error when no config present for legacy SSL ports
Matthew Wild <mwild1@gmail.com>
parents:
2550
diff
changeset
|
231 elseif err == "no ssl context" then |
c3afa1e02e8f
prosody: Show friendly error when no config present for legacy SSL ports
Matthew Wild <mwild1@gmail.com>
parents:
2550
diff
changeset
|
232 friendly_message = "there is no 'ssl' config under Host \"*\" which is " |
c3afa1e02e8f
prosody: Show friendly error when no config present for legacy SSL ports
Matthew Wild <mwild1@gmail.com>
parents:
2550
diff
changeset
|
233 .."require for legacy SSL ports"; |
2550
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
234 end |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
235 log("error", "Failed to open server port %d, %s", port, friendly_message); |
445b1de5652e
prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents:
2548
diff
changeset
|
236 end |
2086
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
237 end |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
238 end |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
239 end |
911251f00f32
prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents:
2055
diff
changeset
|
240 end |
1311
fc113027a1d5
prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents:
1298
diff
changeset
|
241 end |
fc113027a1d5
prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents:
1298
diff
changeset
|
242 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
243 function read_version() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
244 -- Try to determine version |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
245 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
|
246 if version_file then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
247 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
|
248 version_file:close(); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
249 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
|
250 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
|
251 end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
252 else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
253 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
|
254 end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
255 end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
256 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
257 function load_secondary_libraries() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
258 --- Load and initialise core modules |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
259 require "util.import" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
260 require "core.xmlhandlers" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
261 require "core.rostermanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
262 require "core.eventmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
263 require "core.hostmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
264 require "core.modulemanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
265 require "core.usermanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
266 require "core.sessionmanager" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
267 require "core.stanza_router" |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
268 |
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
|
269 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
|
270 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
271 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
|
272 require "util.datetime" |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
273 require "util.iterators" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
274 require "util.timer" |
1532
9150aeca9755
prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents:
1530
diff
changeset
|
275 require "util.helpers" |
9150aeca9755
prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents:
1530
diff
changeset
|
276 |
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
|
277 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
|
278 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
279 -- Commented to protect us from |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
280 -- the second kind of people |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
281 --[[ |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
282 pcall(require, "remdebug.engine"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
283 if remdebug then remdebug.engine.start() end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
284 ]] |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
285 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
286 require "net.connlisteners"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
287 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
288 require "util.stanza" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
289 require "util.jid" |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
290 end |
576
c8442d9f02a5
Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
291 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
292 function init_data_store() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
293 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
|
294 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
|
295 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
|
296 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
|
297 return false; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
298 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
299 return username, host, datastore, data; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
300 end); |
1116
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
301 end |
507702cf44f8
prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents:
1106
diff
changeset
|
302 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
303 function prepare_to_start() |
2341
27584901ddb5
prosody: Report the current socket backend in use
Matthew Wild <mwild1@gmail.com>
parents:
2337
diff
changeset
|
304 log("debug", "Prosody is using the %s backend for connection handling", server.get_backend()); |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
305 -- 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
|
306 eventmanager.fire_event("server-starting"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
307 prosody.events.fire_event("server-starting"); |
133
b92493ea6fd7
Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents:
99
diff
changeset
|
308 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
309 -- start listening on sockets |
2353
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
310 if config.get("*", "core", "ports") then |
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
311 prosody.net_activate_ports(nil, "multiplex", {5222, 5269}); |
2362
7f5dbf982d14
prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports.
Waqas Hussain <waqas20@gmail.com>
parents:
2353
diff
changeset
|
312 if config.get("*", "core", "ssl_ports") then |
7f5dbf982d14
prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports.
Waqas Hussain <waqas20@gmail.com>
parents:
2353
diff
changeset
|
313 prosody.net_activate_ports("ssl", "multiplex", {5223}, "ssl"); |
7f5dbf982d14
prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports.
Waqas Hussain <waqas20@gmail.com>
parents:
2353
diff
changeset
|
314 end |
2353
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
315 else |
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
316 prosody.net_activate_ports("c2s", "xmppclient", {5222}); |
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
317 prosody.net_activate_ports("s2s", "xmppserver", {5269}); |
2494
6a60d67b4bb8
prosody: Listen for component connections on port 5347 by default.
Waqas Hussain <waqas20@gmail.com>
parents:
2429
diff
changeset
|
318 prosody.net_activate_ports("component", "xmppcomponent", {5347}, "tcp"); |
2353
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
319 prosody.net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl"); |
54e650624ded
prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents:
2352
diff
changeset
|
320 end |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
321 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
322 prosody.start_time = os.time(); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
323 end |
382 | 324 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
325 function init_global_protection() |
2346
f5c8f727b2a9
Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents:
2341
diff
changeset
|
326 -- Catch global accesses |
f5c8f727b2a9
Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents:
2341
diff
changeset
|
327 local locked_globals_mt = { |
2348
c7e5ed5eca99
prosody: Call tostring on the key being used for nil global read before concatenating it with a string.
Waqas Hussain <waqas20@gmail.com>
parents:
2347
diff
changeset
|
328 __index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end; |
2346
f5c8f727b2a9
Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents:
2341
diff
changeset
|
329 __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end; |
f5c8f727b2a9
Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents:
2341
diff
changeset
|
330 }; |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
331 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
332 function prosody.unlock_globals() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
333 setmetatable(_G, nil); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
334 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
335 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
336 function prosody.lock_globals() |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
337 setmetatable(_G, locked_globals_mt); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
338 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
|
339 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
340 -- And lock now... |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
341 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
|
342 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
|
343 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
344 function loop() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
345 -- 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
|
346 local function catch_uncaught_error(err) |
2330
e80790636cbe
prosody: Less strict matching for the magic 'interrupted' error
Matthew Wild <mwild1@gmail.com>
parents:
2322
diff
changeset
|
347 if type(err) == "string" and err:match("interrupted!$") then |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
348 return "quitting"; |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
349 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
350 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
351 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
|
352 local traceback = debug.traceback("", 2); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
353 if traceback then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
354 log("error", "%s", traceback); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
355 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
356 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
357 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
|
358 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
|
359 |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
360 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
|
361 socket.sleep(0.2); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
362 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
|
363 end |
1026
e640df2e4e9b
prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents:
1017
diff
changeset
|
364 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
365 function cleanup() |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
366 log("info", "Shutdown status: Cleaning up"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
367 prosody.events.fire_event("server-cleanup"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
368 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
369 -- 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
|
370 -- 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
|
371 server.setquitting(false); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
372 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
373 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
|
374 for hostname, host in pairs(hosts) do |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
375 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
|
376 if host.sessions then |
1561
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
377 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
|
378 if prosody.shutdown_reason then |
04442f3ebe40
prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents:
1557
diff
changeset
|
379 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
|
380 end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
381 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
|
382 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
|
383 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
|
384 session:close(reason); |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
385 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
386 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
387 end |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
388 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
389 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
|
390 if host.s2sout then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
391 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
|
392 if session.close then |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
393 session:close("system-shutdown"); |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
394 else |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
395 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
|
396 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
|
397 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
|
398 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
|
399 end |
1529
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
400 |
b5e4215f797d
prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents:
1523
diff
changeset
|
401 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
|
402 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
|
403 |
1091
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
404 server.setquitting(true); |
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
405 end |
5ca2d3a33269
prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents:
1086
diff
changeset
|
406 |
2337
9eb20b3f3bbb
prosody: Clarify and add some comments to describe what we're doing when and why
Matthew Wild <mwild1@gmail.com>
parents:
2330
diff
changeset
|
407 -- Are you ready? :) |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
408 read_config(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
409 load_libraries(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
410 init_global_state(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
411 read_version(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
412 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
|
413 load_secondary_libraries(); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
414 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
|
415 init_global_protection(); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
416 prepare_to_start(); |
1493
42a6a197bed1
prosody: Record time the server started
Matthew Wild <mwild1@gmail.com>
parents:
1455
diff
changeset
|
417 |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
418 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
|
419 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
|
420 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
421 loop(); |
853
c0a40522041e
prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents:
843
diff
changeset
|
422 |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
423 log("info", "Shutting down..."); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
424 cleanup(); |
1026
e640df2e4e9b
prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents:
1017
diff
changeset
|
425 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
|
426 prosody.events.fire_event("server-stopped"); |
1530
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
427 log("info", "Shutdown complete"); |
0494f5e3be23
prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents:
1529
diff
changeset
|
428 |