prosody
eca772495e20
prosody

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

Software / code / prosody

Annotate

prosody @ 1236:eca772495e20

prosody: New global 'prosody' object
author Matthew Wild <mwild1@gmail.com>
date Sat, 30 May 2009 14:01:12 +0100
parent 1221:23c7d41ca93c
child 1237:a30ca0d0df38
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
896
2c0b9e3c11c3 0.3->0.4
Matthew Wild <mwild1@gmail.com>
parents: 882
diff changeset
2 -- Prosody IM v0.4
761
67ec69001fd7 Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents: 755
diff changeset
3 -- Copyright (C) 2008-2009 Matthew Wild
67ec69001fd7 Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents: 755
diff changeset
4 -- Copyright (C) 2008-2009 Waqas Hussain
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
5 --
761
67ec69001fd7 Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents: 755
diff changeset
6 -- This project is MIT/X11 licensed. Please see the
67ec69001fd7 Update main prosody file, since it doesn't match *.lua pattern, and sed -i treats symlinks badly
Matthew Wild <mwild1@gmail.com>
parents: 755
diff changeset
7 -- COPYING file in the source package for more information.
519
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
8 --
cccd610a0ef9 Insert copyright/license headers
Matthew Wild <mwild1@gmail.com>
parents: 502
diff changeset
9
843
1d2dab41b0db prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents: 793
diff changeset
10 -- Will be modified by configure script if run --
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
11
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
12 CFG_SOURCEDIR=nil;
523
c0f15538f358 config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents: 502
diff changeset
13 CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR");
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
14 CFG_PLUGINDIR=nil;
523
c0f15538f358 config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents: 502
diff changeset
15 CFG_DATADIR=os.getenv("PROSODY_DATADIR");
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
16
843
1d2dab41b0db prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents: 793
diff changeset
17 -- -- -- -- -- -- -- ---- -- -- -- -- -- -- -- --
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
18
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
19 if CFG_SOURCEDIR then
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
20 package.path = CFG_SOURCEDIR.."/?.lua;"..package.path
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
21 package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
22 end
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
23
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
24 if CFG_DATADIR then
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
25 if os.getenv("HOME") then
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
26 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME"));
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
27 end
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
28 end
467
66f145f5c932 Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents: 455
diff changeset
29
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
30 -- Required to be able to find packages installed with luarocks
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
31 pcall(require, "luarocks.require")
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
32
455
2eeae9c314b0 main.lua -> prosody
Matthew Wild <mwild1@gmail.com>
parents: 452
diff changeset
33
433
afbf29498123 Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents: 412
diff changeset
34 config = require "core.configmanager"
612
0d44fc0a78f8 Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents: 605
diff changeset
35
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
36 do
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
37 -- TODO: Check for other formats when we add support for them
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
38 -- Use lfs? Make a new conf/ dir?
793
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
39 local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
40 if not ok then
1001
4bd375bde3cb prosody: Simple whitespace fix in error output
Matthew Wild <mwild1@gmail.com>
parents: 992
diff changeset
41 print("\n");
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
42 print("**************************");
793
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
43 if level == "parser" then
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
44 print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
45 local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
46 print("Error"..(err_line and (" on line "..err_line) or "")..": "..(err_message or tostring(err)));
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
47 print("");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
48 elseif level == "file" then
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
49 print("Prosody was unable to find the configuration file.");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
50 print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
51 print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
52 print("Copy or rename it to prosody.cfg.lua and edit as necessary.");
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
53 end
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
54 print("More help on configuring Prosody can be found at http://prosody.im/doc/configure");
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
55 print("Good luck!");
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
56 print("**************************");
793
55add3b87c01 Report errors in the config file to the user
Matthew Wild <mwild1@gmail.com>
parents: 761
diff changeset
57 print("");
744
328b702fb80c Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents: 739
diff changeset
58 os.exit(1);
376
6d87944df37c New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents: 359
diff changeset
59 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
60 end
36
62998e5319e3 Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents: 34
diff changeset
61
1017
6556a9db3822 prosody: Remove logging code and instead load core.loggingmanager to set up logging
Matthew Wild <mwild1@gmail.com>
parents: 1001
diff changeset
62 --- Initialize logging
6556a9db3822 prosody: Remove logging code and instead load core.loggingmanager to set up logging
Matthew Wild <mwild1@gmail.com>
parents: 1001
diff changeset
63 require "core.loggingmanager"
882
e362bafbbb68 prosody: Load logger after reading the config
Matthew Wild <mwild1@gmail.com>
parents: 853
diff changeset
64
1017
6556a9db3822 prosody: Remove logging code and instead load core.loggingmanager to set up logging
Matthew Wild <mwild1@gmail.com>
parents: 1001
diff changeset
65 --- Check runtime dependencies
755
c9f4f7f08a48 Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents: 744
diff changeset
66 require "util.dependencies"
c9f4f7f08a48 Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents: 744
diff changeset
67
1017
6556a9db3822 prosody: Remove logging code and instead load core.loggingmanager to set up logging
Matthew Wild <mwild1@gmail.com>
parents: 1001
diff changeset
68 --- Load socket framework
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
69 local server = require "net.server"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
70
1221
23c7d41ca93c Added globals bare_sessions and full_sessions, which map bare and full JIDs to sessions.
Waqas Hussain <waqas20@gmail.com>
parents: 1220
diff changeset
71 bare_sessions = {};
23c7d41ca93c Added globals bare_sessions and full_sessions, which map bare and full JIDs to sessions.
Waqas Hussain <waqas20@gmail.com>
parents: 1220
diff changeset
72 full_sessions = {};
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
73 hosts = {};
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
74
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
75 -- Global 'prosody' object
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
76 prosody = {};
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
77 local prosody = prosody;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
78
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
79 prosody.bare_sessions = bare_sessions;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
80 prosody.full_sessions = full_sessions;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
81 prosody.hosts = hosts;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
82
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
83 prosody.paths = { source = CFG_SOURCEDIR, config = CFG_CONFIGDIR,
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
84 plugins = CFG_PLUGINDIR, data = CFG_DATADIR };
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
85
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
86 prosody.arg = arg;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
87
1017
6556a9db3822 prosody: Remove logging code and instead load core.loggingmanager to set up logging
Matthew Wild <mwild1@gmail.com>
parents: 1001
diff changeset
88 --- Load and initialise core modules
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
89 require "util.import"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
90 require "core.xmlhandlers"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
91 require "core.rostermanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
92 require "core.eventmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
93 require "core.hostmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
94 require "core.modulemanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
95 require "core.usermanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
96 require "core.sessionmanager"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
97 require "core.stanza_router"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
98
942
dae54304967d Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents: 941
diff changeset
99 require "util.array"
dae54304967d Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents: 941
diff changeset
100 require "util.iterators"
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
101 require "util.timer"
942
dae54304967d Load util.array and util.iterator at startup
Matthew Wild <mwild1@gmail.com>
parents: 941
diff changeset
102
843
1d2dab41b0db prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents: 793
diff changeset
103 -- Commented to protect us from
1d2dab41b0db prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents: 793
diff changeset
104 -- the second kind of people
1d2dab41b0db prosody: Protect main loop. Dare I say crashing finally becomes impossible.
Matthew Wild <mwild1@gmail.com>
parents: 793
diff changeset
105 --[[
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
106 pcall(require, "remdebug.engine");
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
107 if remdebug then remdebug.engine.start() end
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
108 ]]
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
109
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
110 local cl = require "net.connlisteners";
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
111
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
112 require "util.stanza"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
113 require "util.jid"
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
114
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
115 ------------------------------------------------------------------------
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
116
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
117
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
118 ------------- Begin code without a home ---------------------
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
119
502
21dc299387a6 Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents: 500
diff changeset
120 local data_path = config.get("*", "core", "data_path") or CFG_DATADIR or "data";
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
121 require "util.datamanager".set_data_path(data_path);
933
2a5352e0e10e Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents: 907
diff changeset
122 require "util.datamanager".set_callback(function(username, host, datastore)
2a5352e0e10e Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents: 907
diff changeset
123 return config.get(host, "core", "anonymous_login");
2a5352e0e10e Added: Prevent disk writes for anonmous hosts (option: core/anonymous_login = true)
Waqas Hussain <waqas20@gmail.com>
parents: 907
diff changeset
124 end);
576
c8442d9f02a5 Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents: 573
diff changeset
125
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
126 ----------- End of out-of-place code --------------
99
ba08b8a4eeef Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents: 97
diff changeset
127
1116
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
128 -- Function to reload the config file
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
129 function prosody_reload_config()
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
130 log("info", "Reloading configuration file");
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
131 eventmanager.fire_event("reloading-config");
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
132 local ok, level, err = config.load((rawget(_G, "CFG_CONFIGDIR") or ".").."/prosody.cfg.lua");
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
133 if not ok then
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
134 if level == "parser" then
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
135 log("error", "There was an error parsing the configuration file: %s", tostring(err));
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
136 elseif level == "file" then
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
137 log("error", "Couldn't read the config file when trying to reload: %s", tostring(err));
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
138 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
139 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
140 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
141
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
142 -- Function to reopen logfiles
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
143 function prosody.reopen_logfiles()
1116
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
144 log("info", "Re-opening log files");
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
145 eventmanager.fire_event("reopen-log-files"); -- Handled by appropriate log sinks
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
146 end
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
147
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
148 -- Temporary
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
149 prosody_reopen_logfiles = prosody.reopen_logfiles;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
150
1116
507702cf44f8 prosody: Add functions to reload the config and re-open log files
Matthew Wild <mwild1@gmail.com>
parents: 1106
diff changeset
151 -- Function to initiate prosody shutdown
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
152 function prosody.shutdown(reason)
1091
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
153 log("info", "Shutting down: %s", reason or "unknown reason");
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
154 eventmanager.fire_event("server-stopping", { reason = reason });
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
155 server.setquitting(true);
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
156 end
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
157
1236
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
158 -- Temporary
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
159 prosody_shutdown = prosody.shutdown;
eca772495e20 prosody: New global 'prosody' object
Matthew Wild <mwild1@gmail.com>
parents: 1221
diff changeset
160
1091
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
161 -- Signal to modules that we are ready to start
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
162 eventmanager.fire_event("server-starting");
133
b92493ea6fd7 Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents: 99
diff changeset
163
1091
5ca2d3a33269 prosody: Define prosody_shutdown() before emitting the server-starting event
Matthew Wild <mwild1@gmail.com>
parents: 1086
diff changeset
164 -- Load SSL settings from config, and create a ctx table
972
144d0ad17389 prosody: Don't look to use SSL when LuaSec not available (thanks Florob)
Matthew Wild <mwild1@gmail.com>
parents: 943
diff changeset
165 local global_ssl_ctx = ssl and config.get("*", "core", "ssl");
940
776cb8c847c5 Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents: 907
diff changeset
166 if global_ssl_ctx then
776cb8c847c5 Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents: 907
diff changeset
167 local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; };
776cb8c847c5 Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents: 907
diff changeset
168 setmetatable(global_ssl_ctx, { __index = default_ssl_ctx });
776cb8c847c5 Move SSL initialisation into the correct spot (thanks albert)
Matthew Wild <mwild1@gmail.com>
parents: 907
diff changeset
169 end
0
3e3171b59028 First commit, where do you want to go tomorrow?
matthew
parents:
diff changeset
170
218
1263896ab2f1 Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents: 207
diff changeset
171 -- start listening on sockets
907
289388b79a83 prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents: 906
diff changeset
172 function net_activate_ports(option, listener, default, conntype)
978
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
173 local ports = config.get("*", "core", option.."_ports") or default;
906
0831db62f134 prosody: Allow ports to be specified as just numbers
Matthew Wild <mwild1@gmail.com>
parents: 896
diff changeset
174 if type(ports) == "number" then ports = {ports} end;
658
1952fdcf1017 Fix specifying ports in config, and SSL support
Matthew Wild <mwild1@gmail.com>
parents: 643
diff changeset
175
605
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
176 if type(ports) ~= "table" then
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
177 log("error", "core."..option.." is not a table");
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
178 else
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
179 for _, port in ipairs(ports) do
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
180 if type(port) ~= "number" then
978
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
181 log("error", "Non-numeric "..option.."_ports: "..tostring(port));
605
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
182 else
978
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
183 cl.start(listener, {
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
184 ssl = conntype ~= "tcp" and global_ssl_ctx,
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
185 port = port,
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
186 interface = config.get("*", "core", option.."_interface"),
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
187 type = conntype
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
188 });
605
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
189 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
190 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
191 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
192 end
8458be0941e7 Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents: 580
diff changeset
193
978
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
194 net_activate_ports("c2s", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp");
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
195 net_activate_ports("s2s", "xmppserver", {5269}, "tcp");
1106
b51a65066595 prosody, xmppcomponent_listener: Add listener for XEP-0114 component connections
Matthew Wild <mwild1@gmail.com>
parents: 1093
diff changeset
196 net_activate_ports("component", "xmppcomponent", {}, "tcp");
978
a9898f54b402 Allow config to specify listening interfaces
Matthew Wild <mwild1@gmail.com>
parents: 972
diff changeset
197 net_activate_ports("legacy_ssl", "xmppclient", {}, "ssl");
1
b8787e859fd2 Switched to new connection framework, courtesy of the luadch project
matthew
parents: 0
diff changeset
198
1084
422be8f8911c prosody: Don't require console_enabled option anymore
Matthew Wild <mwild1@gmail.com>
parents: 1026
diff changeset
199 if cl.get("console") then
422be8f8911c prosody: Don't require console_enabled option anymore
Matthew Wild <mwild1@gmail.com>
parents: 1026
diff changeset
200 cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" })
383
32b586d9e915 Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents: 382
diff changeset
201 end
382
9daf1e3d278e Add initial mod_console
Matthew Wild <mwild1@gmail.com>
parents: 381
diff changeset
202
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
203 -- Catch global accesses --
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
204 local locked_globals_mt = { __index = function (t, k) error("Attempt to read a non-existent global '"..k.."'", 2); end, __newindex = function (t, k, v) error("Attempt to set a global: "..tostring(k).." = "..tostring(v), 2); end }
7f161205121d Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents: 942
diff changeset
205
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
206 function unlock_globals()
7f161205121d Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents: 942
diff changeset
207 setmetatable(_G, nil);
7f161205121d Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents: 942
diff changeset
208 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
209
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
210 function lock_globals()
7f161205121d Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents: 942
diff changeset
211 setmetatable(_G, locked_globals_mt);
7f161205121d Add lock_globals() and unlock_globals() functions (for when you really need to use globals)
Matthew Wild <mwild1@gmail.com>
parents: 942
diff changeset
212 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
213
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
214 -- And lock now...
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
215 lock_globals();
907
289388b79a83 prosody: Expose net_activate_ports as a global function for use by plugins
Matthew Wild <mwild1@gmail.com>
parents: 906
diff changeset
216
569
5216efe6088b Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents: 524
diff changeset
217 eventmanager.fire_event("server-started");
359
8fbfa8f885a6 Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents: 260
diff changeset
218
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
219 -- Error handler for errors that make it this far
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
220 local function catch_uncaught_error(err)
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
221 if err:match("%d*: interrupted!$") then
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
222 return "quitting";
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
223 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
224
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
225 log("error", "Top-level error, please report:\n%s", tostring(err));
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
226 local traceback = debug.traceback("", 2);
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
227 if traceback then
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
228 log("error", "%s", traceback);
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
229 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
230
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
231 eventmanager.fire_event("very-bad-error", "*", err, traceback);
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
232 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
233
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
234 while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
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
235 socket.sleep(0.2);
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
236 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
237
1086
0b895e1ac713 prosody: Add log messages during shutdown sequence to indicate progress
Matthew Wild <mwild1@gmail.com>
parents: 1084
diff changeset
238 log("info", "Shutdown status: Cleaning up");
1026
e640df2e4e9b prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents: 1017
diff changeset
239 eventmanager.fire_event("server-cleanup");
e640df2e4e9b prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents: 1017
diff changeset
240
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
241 -- Ok, we're quitting I know, but we
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
242 -- need to do some tidying before we go :)
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
243 server.setquitting(false);
853
c0a40522041e prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents: 843
diff changeset
244
1093
5b7b2d2e9a33 prosody: Less verbose logging during shutdown sequence
Matthew Wild <mwild1@gmail.com>
parents: 1091
diff changeset
245 log("info", "Shutdown status: Closing all active sessions");
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
246 for hostname, host in pairs(hosts) do
1093
5b7b2d2e9a33 prosody: Less verbose logging during shutdown sequence
Matthew Wild <mwild1@gmail.com>
parents: 1091
diff changeset
247 log("debug", "Shutdown status: Closing client connections for %s", hostname)
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
248 if host.sessions then
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
249 for username, user in pairs(host.sessions) do
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
250 for resource, session in pairs(user.sessions) do
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
251 log("debug", "Closing connection for %s@%s/%s", username, hostname, resource);
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
252 session:close("system-shutdown");
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
253 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
254 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
255 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
256
1093
5b7b2d2e9a33 prosody: Less verbose logging during shutdown sequence
Matthew Wild <mwild1@gmail.com>
parents: 1091
diff changeset
257 log("debug", "Shutdown status: Closing outgoing s2s connections from %s", hostname);
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
258 if host.s2sout then
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
259 for remotehost, session in pairs(host.s2sout) do
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
260 if session.close then
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
261 session:close("system-shutdown");
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
262 else
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
263 log("warn", "Unable to close outgoing s2s session to %s, no session:close()?!", remotehost);
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
264 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
265 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
266 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
267 end
853
c0a40522041e prosody: Log top-level errors
Matthew Wild <mwild1@gmail.com>
parents: 843
diff changeset
268
1086
0b895e1ac713 prosody: Add log messages during shutdown sequence to indicate progress
Matthew Wild <mwild1@gmail.com>
parents: 1084
diff changeset
269 log("info", "Shutdown status: Closing all server connections");
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
270 server.closeall();
1026
e640df2e4e9b prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents: 1017
diff changeset
271
1086
0b895e1ac713 prosody: Add log messages during shutdown sequence to indicate progress
Matthew Wild <mwild1@gmail.com>
parents: 1084
diff changeset
272 server.setquitting(true);
0b895e1ac713 prosody: Add log messages during shutdown sequence to indicate progress
Matthew Wild <mwild1@gmail.com>
parents: 1084
diff changeset
273
1026
e640df2e4e9b prosody: Fire events during server shutdown process
Matthew Wild <mwild1@gmail.com>
parents: 1017
diff changeset
274 eventmanager.fire_event("server-stopped");
1086
0b895e1ac713 prosody: Add log messages during shutdown sequence to indicate progress
Matthew Wild <mwild1@gmail.com>
parents: 1084
diff changeset
275 log("info", "Shutdown status: Complete!");