prosody
0194d7eab8a5
prosody

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

Software / code / prosody

Annotate

prosody @ 3033:0194d7eab8a5

prosody: Load util.xmppstream :(
author Matthew Wild <mwild1@gmail.com>
date Sun, 09 May 2010 20:46:24 +0100
parent 3029:0c7beabfed5b
child 3305:b1ee8d390744
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
1 #!/usr/bin/env lua
1523
841d61be198f Remove version number from copyright headers
Matthew Wild <mwild1@gmail.com>
parents: 1493
diff changeset
2 -- Prosody IM
2923
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2877
diff changeset
3 -- Copyright (C) 2008-2010 Matthew Wild
b7049746bd29 Update copyright headers for 2010
Matthew Wild <mwild1@gmail.com>
parents: 2877
diff changeset
4 -- Copyright (C) 2008-2010 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
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
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
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
16
2147
119323e35c32 Mainfile: Fixed some comments.
Waqas Hussain <waqas20@gmail.com>
parents: 2087
diff changeset
17 -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
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
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
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
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
23 end
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
24
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
25 -- 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
26 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
27 if os.getenv("HOME") then
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
28 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
29 end
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
30 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
31
2986
fff153f7f4de eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely
Matthew Wild <mwild1@gmail.com>
parents: 2985
diff changeset
32 -- Global 'prosody' object
fff153f7f4de eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely
Matthew Wild <mwild1@gmail.com>
parents: 2985
diff changeset
33 prosody = { events = require "util.events".new(); };
fff153f7f4de eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely
Matthew Wild <mwild1@gmail.com>
parents: 2985
diff changeset
34 local prosody = prosody;
fff153f7f4de eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step towards removing it entirely
Matthew Wild <mwild1@gmail.com>
parents: 2985
diff changeset
35
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
36 -- Load the config-parsing module
433
afbf29498123 Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents: 412
diff changeset
37 config = require "core.configmanager"
612
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
38
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
39 -- -- -- --
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
40 -- 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
41 -- 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
42 -- functions get called
612
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
43
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
44 function read_config()
2154
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
45 local filenames = {};
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
46
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
47 local filename;
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
48 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
49 table.insert(filenames, arg[2]);
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
50 if CFG_CONFIGDIR then
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
51 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
52 end
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
53 else
2428
3ba9db4b9311 prosody: Read list of possible config extensions from configmanager, removes old TODO
Matthew Wild <mwild1@gmail.com>
parents: 2365
diff changeset
54 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
55 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
56 end
2154
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
57 end
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
58 for _,_filename in ipairs(filenames) do
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
59 filename = _filename;
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
60 local file = io.open(filename);
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
61 if file then
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
62 file:close();
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
63 CFG_CONFIGDIR = filename:match("^(.*)[\\/][^\\/]*$");
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
64 break;
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
65 end
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
66 end
b8635ebd7f57 prosody: Added support for command line argument '--config'.
Waqas Hussain <waqas20@gmail.com>
parents: 2147
diff changeset
67 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
68 if not ok then
1001
4bd375bde3cb prosody: Simple whitespace fix in error output
Matthew Wild <mwild1@gmail.com>
parents: 992
diff changeset
69 print("\n");
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
70 print("**************************");
793
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
71 if level == "parser" then
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
72 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
73 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
74 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
75 print("");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
76 elseif level == "file" then
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
77 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
78 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
79 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
80 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
81 end
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
82 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
83 print("Good luck!");
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
84 print("**************************");
793
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
85 print("");
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
86 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
87 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
88 end
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
89
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
90 function load_libraries()
2147
119323e35c32 Mainfile: Fixed some comments.
Waqas Hussain <waqas20@gmail.com>
parents: 2087
diff changeset
91 -- Load socket framework
1529
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
2587
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
95 function init_logging()
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
96 -- Initialize logging
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
97 require "core.loggingmanager"
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
98 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
99
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
100 function check_dependencies()
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
101 -- Check runtime dependencies
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
102 if not require "util.dependencies".check_dependencies() then
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
103 os.exit(1);
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
104 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
105 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
106
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
107 function sandbox_require()
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
108 -- Replace require() with one that doesn't pollute _G, required
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
109 -- for neat sandboxing of modules
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
110 local _realG = _G;
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
111 local _real_require = require;
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
112 function require(...)
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
113 local curr_env = getfenv(2);
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
114 local curr_env_mt = getmetatable(getfenv(2));
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
115 local _realG_mt = getmetatable(_realG);
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
116 if curr_env_mt and curr_env_mt.__index and not curr_env_mt.__newindex and _realG_mt then
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
117 local old_newindex
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
118 old_newindex, _realG_mt.__newindex = _realG_mt.__newindex, curr_env;
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
119 local ret = _real_require(...);
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
120 _realG_mt.__newindex = old_newindex;
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
121 return ret;
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
122 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
123 return _real_require(...);
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
124 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
125 end
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
126
2976
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
127 function set_function_metatable()
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
128 local mt = {};
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
129 function mt.__index(f, upvalue)
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
130 local i, name, value = 0;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
131 repeat
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
132 i = i + 1;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
133 name, value = debug.getupvalue(f, i);
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
134 until name == upvalue or name == nil;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
135 return value;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
136 end
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
137 function mt.__newindex(f, upvalue, value)
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
138 local i, name = 0;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
139 repeat
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
140 i = i + 1;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
141 name = debug.getupvalue(f, i);
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
142 until name == upvalue or name == nil;
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
143 if name then
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
144 debug.setupvalue(f, i, value);
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
145 end
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
146 end
3024
9c74785c6351 prosody: Modified function metatable for better string representation of functions.
Waqas Hussain <waqas20@gmail.com>
parents: 3023
diff changeset
147 function mt.__tostring(f)
9c74785c6351 prosody: Modified function metatable for better string representation of functions.
Waqas Hussain <waqas20@gmail.com>
parents: 3023
diff changeset
148 local info = debug.getinfo(f);
9c74785c6351 prosody: Modified function metatable for better string representation of functions.
Waqas Hussain <waqas20@gmail.com>
parents: 3023
diff changeset
149 return ("function(%s:%d)"):format(info.short_src:match("[^\\/]*$"), info.linedefined);
9c74785c6351 prosody: Modified function metatable for better string representation of functions.
Waqas Hussain <waqas20@gmail.com>
parents: 3023
diff changeset
150 end
2976
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
151 debug.setmetatable(function() end, mt);
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
152 end
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
153
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
154 function init_global_state()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
155 bare_sessions = {};
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
156 full_sessions = {};
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
157 hosts = {};
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
158
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
159 prosody.bare_sessions = bare_sessions;
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
160 prosody.full_sessions = full_sessions;
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
161 prosody.hosts = hosts;
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
162
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
163 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
164 plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
165
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
166 prosody.arg = _G.arg;
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
167
1789
23a66fdf541e prosody: Add prosody.platform which can be either 'windows', 'posix' or 'unknown'
Matthew Wild <mwild1@gmail.com>
parents: 1622
diff changeset
168 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
169 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
170 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
171 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
172 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
173 end
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
174
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
175 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
176 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
177 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
178 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
179
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
180 -- Function to reload the config file
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
181 function prosody.reload_config()
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
182 log("info", "Reloading configuration file");
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
183 prosody.events.fire_event("reloading-config");
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
184 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
185 if not ok then
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
186 if level == "parser" then
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
187 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
188 elseif level == "file" then
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
189 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
190 end
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
191 end
1557
64837ed2d112 prosody: Return success/error from prosody.reload_config()
Matthew Wild <mwild1@gmail.com>
parents: 1532
diff changeset
192 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
193 end
1242
6c459c279bbe Added new prosody.events object
Waqas Hussain <waqas20@gmail.com>
parents: 1239
diff changeset
194
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
195 -- Function to reopen logfiles
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
196 function prosody.reopen_logfiles()
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
197 log("info", "Re-opening log files");
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
198 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
199 end
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
200
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
201 -- Function to initiate prosody shutdown
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
202 function prosody.shutdown(reason)
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
203 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
204 prosody.shutdown_reason = reason;
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
205 prosody.events.fire_event("server-stopping", {reason = reason});
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
206 server.setquitting(true);
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
207 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
208
911251f00f32 prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents: 2055
diff changeset
209 -- Load SSL settings from config, and create a ctx table
2632
a461c682f67d prosody: Use certmanager to create the global SSL context
Matthew Wild <mwild1@gmail.com>
parents: 2587
diff changeset
210 local certmanager = require "core.certmanager";
a461c682f67d prosody: Use certmanager to create the global SSL context
Matthew Wild <mwild1@gmail.com>
parents: 2587
diff changeset
211 local global_ssl_ctx = certmanager.create_context("*", "server");
a461c682f67d prosody: Use certmanager to create the global SSL context
Matthew Wild <mwild1@gmail.com>
parents: 2587
diff changeset
212 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
213
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 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
215 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
216 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
217 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
218 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
219 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
220 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
221
911251f00f32 prosody.net_activate_ports: Slightly refactored and definition moved to before modules are loaded.
Waqas Hussain <waqas20@gmail.com>
parents: 2055
diff changeset
222 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
223 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
224 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
225 for _, port in ipairs(ports) do
2789
2419ca0bfab3 prosody: net_activate_ports: Accept strings as well as numbers for specifying ports
Matthew Wild <mwild1@gmail.com>
parents: 2778
diff changeset
226 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
227 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
228 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
229 else
2846
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
230 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
231 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
232 port = port,
2778
d591e2c90807 prosody: Fixed a possible nil concatenation.
Waqas Hussain <waqas20@gmail.com>
parents: 2769
diff changeset
233 interface = (option and config.get("*", "core", option.."_interface"))
d591e2c90807 prosody: Fixed a possible nil concatenation.
Waqas Hussain <waqas20@gmail.com>
parents: 2769
diff changeset
234 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
235 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
236 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
237 });
2846
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
238 if not ok then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
239 local friendly_message = err;
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
240 if err:match(" in use") then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
241 if port == 5222 or port == 5223 or port == 5269 then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
242 friendly_message = "check that Prosody or another XMPP server is "
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
243 .."not already running and using this port";
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
244 elseif port == 80 or port == 81 then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
245 friendly_message = "check that a HTTP server is not already using "
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
246 .."this port";
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
247 elseif port == 5280 then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
248 friendly_message = "check that Prosody or a BOSH connection manager "
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
249 .."is not already running";
2849
c940726e787e prosody: Add a catch-all friendly message for when any port is in use we want to use
Matthew Wild <mwild1@gmail.com>
parents: 2847
diff changeset
250 else
c940726e787e prosody: Add a catch-all friendly message for when any port is in use we want to use
Matthew Wild <mwild1@gmail.com>
parents: 2847
diff changeset
251 friendly_message = "this port is in use by another application";
2846
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
252 end
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
253 elseif err:match("permission") then
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
254 friendly_message = "Prosody does not have sufficient privileges to use this port";
2847
a34decf98668 prosody: Show friendly error when no config present for legacy SSL ports
Matthew Wild <mwild1@gmail.com>
parents: 2846
diff changeset
255 elseif err == "no ssl context" then
2859
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
256 if not config.get("*", "core", "ssl") then
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
257 friendly_message = "there is no 'ssl' config under Host \"*\" which is "
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
258 .."require for legacy SSL ports";
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
259 else
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
260 friendly_message = "initializing SSL support failed, see previous log entries";
460681180194 prosody: More accurate friendly error message in the event that creating the global SSL context fails
Matthew Wild <mwild1@gmail.com>
parents: 2849
diff changeset
261 end
2846
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
262 end
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
263 log("error", "Failed to open server port %d, %s", port, friendly_message);
f2396d7fb6f4 prosody: Log error message when failing to open ports
Matthew Wild <mwild1@gmail.com>
parents: 2840
diff changeset
264 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
265 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
266 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
267 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
268 end
1311
fc113027a1d5 prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents: 1298
diff changeset
269 end
fc113027a1d5 prosody: Read version from prosody.version file and set, er, prosody.version!
Matthew Wild <mwild1@gmail.com>
parents: 1298
diff changeset
270
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
271 function read_version()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
272 -- Try to determine version
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
273 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
274 if version_file then
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
275 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
276 version_file:close();
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
277 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
278 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
279 end
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
280 else
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
281 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
282 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
283 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
284
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
285 function load_secondary_libraries()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
286 --- Load and initialise core modules
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
287 require "util.import"
3033
0194d7eab8a5 prosody: Load util.xmppstream :(
Matthew Wild <mwild1@gmail.com>
parents: 3029
diff changeset
288 require "util.xmppstream"
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
289 require "core.xmlhandlers"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
290 require "core.rostermanager"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
291 require "core.hostmanager"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
292 require "core.modulemanager"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
293 require "core.usermanager"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
294 require "core.sessionmanager"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
295 require "core.stanza_router"
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
296
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
297 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
298
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
299 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
300 require "util.datetime"
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
301 require "util.iterators"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
302 require "util.timer"
1532
9150aeca9755 prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents: 1530
diff changeset
303 require "util.helpers"
9150aeca9755 prosody: Load util.helpers at startup
Matthew Wild <mwild1@gmail.com>
parents: 1530
diff changeset
304
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
305 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
306
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
307 -- Commented to protect us from
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
308 -- the second kind of people
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
309 --[[
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
310 pcall(require, "remdebug.engine");
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
311 if remdebug then remdebug.engine.start() end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
312 ]]
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
313
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
314 require "net.connlisteners";
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
315
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
316 require "util.stanza"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
317 require "util.jid"
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
318 end
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
319
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
320 function init_data_store()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
321 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
322 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
323 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
324 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
325 return false;
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
326 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
327 return username, host, datastore, data;
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
328 end);
1116
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
329 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
330
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
331 function prepare_to_start()
3023
454e1cf18daf prosody: Lowered log level for a log message.
Waqas Hussain <waqas20@gmail.com>
parents: 2976
diff changeset
332 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
333 -- 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
334 prosody.events.fire_event("server-starting");
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
335
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
336 -- 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
337 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
338 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
339 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
340 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
341 end
2353
54e650624ded prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents: 2352
diff changeset
342 else
54e650624ded prosody: Use the multiplex listener when the 'ports' config option is specified.
Waqas Hussain <waqas20@gmail.com>
parents: 2352
diff changeset
343 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
344 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
345 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
346 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
347 end
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
348
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
349 prosody.start_time = os.time();
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
350 end
382
9daf1e3d278e Add initial mod_console
Matthew Wild <mwild1@gmail.com>
parents: 381
diff changeset
351
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
352 function init_global_protection()
2825
914d7afb8212 Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents: 2154
diff changeset
353 -- Catch global accesses
914d7afb8212 Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents: 2154
diff changeset
354 local locked_globals_mt = {
2827
b9df83793d84 prosody: Call tostring on the key being used for nil global read before concatenating it with a string.
Waqas Hussain <waqas20@gmail.com>
parents: 2826
diff changeset
355 __index = function (t, k) log("warn", "%s", debug.traceback("Attempt to read a non-existent global '"..tostring(k).."'", 2)); end;
2825
914d7afb8212 Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents: 2154
diff changeset
356 __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end;
914d7afb8212 Mainfile: Broke up a really long line.
Waqas Hussain <waqas20@gmail.com>
parents: 2154
diff changeset
357 };
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
358
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
359 function prosody.unlock_globals()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
360 setmetatable(_G, nil);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
361 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
362
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
363 function prosody.lock_globals()
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
364 setmetatable(_G, locked_globals_mt);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
365 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
366
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
367 -- And lock now...
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
368 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
369 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
370
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
371 function loop()
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
372 -- 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
373 local function catch_uncaught_error(err)
2769
826f6fb7036d prosody: Less strict matching for the magic 'interrupted' error
Matthew Wild <mwild1@gmail.com>
parents: 2321
diff changeset
374 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
375 return "quitting";
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
376 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
377
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
378 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
379 local traceback = debug.traceback("", 2);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
380 if traceback then
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
381 log("error", "%s", traceback);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
382 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
383
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
384 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
385 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
386
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
387 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
388 socket.sleep(0.2);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
389 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
390 end
1026
e640df2e4e9b prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents: 1017
diff changeset
391
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
392 function cleanup()
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
393 log("info", "Shutdown status: Cleaning up");
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
394 prosody.events.fire_event("server-cleanup");
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
395
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
396 -- 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
397 -- 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
398 server.setquitting(false);
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
399
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
400 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
401 for hostname, host in pairs(hosts) do
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
402 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
403 if host.sessions then
1561
04442f3ebe40 prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents: 1557
diff changeset
404 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
405 if prosody.shutdown_reason then
04442f3ebe40 prosody: Send friendly text with system-shutdown stream error
Matthew Wild <mwild1@gmail.com>
parents: 1557
diff changeset
406 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
407 end
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
408 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
409 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
410 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
411 session:close(reason);
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
412 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
413 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
414 end
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
415
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
416 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
417 if host.s2sout then
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
418 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
419 if session.close then
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
420 session:close("system-shutdown");
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
421 else
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
422 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
423 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
424 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
425 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
426 end
1529
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
427
b5e4215f797d prosody: Start of refactoring of main file
Matthew Wild <mwild1@gmail.com>
parents: 1523
diff changeset
428 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
429 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
430
1091
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
431 server.setquitting(true);
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
432 end
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
433
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
434 -- Are you ready? :)
2587
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
435 -- These actions are in a strict order, as many depend on
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
436 -- previous steps to have already been performed
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
437 read_config();
2587
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
438 init_logging();
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
439 check_dependencies();
c37f971f0fe6 prosody, prosodyctl: Re-jiggle load order again, fixes logging config not being obeyed (thanks darkrain)
Matthew Wild <mwild1@gmail.com>
parents: 2567
diff changeset
440 sandbox_require();
2976
15c056c1d9eb prosody: Set metatable on functions to allow easy access to upvalues.
Waqas Hussain <waqas20@gmail.com>
parents: 2925
diff changeset
441 set_function_metatable();
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
442 load_libraries();
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
443 init_global_state();
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
444 read_version();
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
445 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
446 load_secondary_libraries();
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
447 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
448 init_global_protection();
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
449 prepare_to_start();
1493
42a6a197bed1 prosody: Record time the server started
Matthew Wild <mwild1@gmail.com>
parents: 1455
diff changeset
450
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
451 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
452
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
453 loop();
853
c0a40522041e prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents: 843
diff changeset
454
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
455 log("info", "Shutting down...");
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
456 cleanup();
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
457 prosody.events.fire_event("server-stopped");
1530
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
458 log("info", "Shutdown complete");
0494f5e3be23 prosody: Call initialisation functions at once
Matthew Wild <mwild1@gmail.com>
parents: 1529
diff changeset
459