Mon, 02 Feb 2009 18:03:18 +0000
Licensing/version updates for some files (forgot to commit, doh...)
455 | 1 | #!/usr/bin/env lua |
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
|
2 | -- Prosody IM v0.3 |
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 | |
455 | 10 | -- Config here -- |
11 | ||
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
12 | CFG_SOURCEDIR=nil; |
523
c0f15538f358
config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents:
502
diff
changeset
|
13 | CFG_CONFIGDIR=os.getenv("PROSODY_CFGDIR"); |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
14 | CFG_PLUGINDIR=nil; |
523
c0f15538f358
config and data directories taken from path, and quoted to allow spaces in path
Waqas Hussain <waqas20@gmail.com>
parents:
502
diff
changeset
|
15 | CFG_DATADIR=os.getenv("PROSODY_DATADIR"); |
455 | 16 | |
17 | -- -- -- -- -- -- | |
18 | ||
19 | if CFG_SOURCEDIR then | |
20 | package.path = CFG_SOURCEDIR.."/?.lua;"..package.path | |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
21 | package.cpath = CFG_SOURCEDIR.."/?.so;"..package.cpath |
455 | 22 | end |
23 | ||
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
24 | if CFG_DATADIR then |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
25 | if os.getenv("HOME") then |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
26 | CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
27 | end |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
28 | end |
467
66f145f5c932
Update Makefile to now pass config paths to prosody. Update prosody, modulemanager and connectionlisteners to obey these paths.
Matthew Wild <mwild1@gmail.com>
parents:
455
diff
changeset
|
29 | |
455 | 30 | -- Required to be able to find packages installed with luarocks |
133
b92493ea6fd7
Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents:
99
diff
changeset
|
31 | pcall(require, "luarocks.require") |
0 | 32 | |
455 | 33 | |
433
afbf29498123
Fix to make a global configmanager instance
Matthew Wild <mwild1@gmail.com>
parents:
412
diff
changeset
|
34 | config = require "core.configmanager" |
376
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
35 | log = require "util.logger".init("general"); |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
36 | |
612
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
37 | -- Disable log output, needs to read from config |
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
38 | -- require "util.logger".setwriter(function () end); |
0d44fc0a78f8
Add commented line to disable logging entirely
Matthew Wild <mwild1@gmail.com>
parents:
605
diff
changeset
|
39 | |
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 | do |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
41 | -- 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
|
42 | -- Use lfs? Make a new conf/ dir? |
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
|
43 | local ok, 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
|
44 | if not ok then |
744
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
45 | print(""); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
46 | print("**************************"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
47 | print("Prosody was unable to find the configuration file."); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
48 | print("We looked for: "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
49 | print("A sample config file is included in the Prosody download called prosody.cfg.lua.dist"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
50 | print("Copy or rename it to prosody.cfg.lua and edit as necessary."); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
51 | 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
|
52 | print("Good luck!"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
53 | print("**************************"); |
328b702fb80c
Friendlier message when config file not found
Matthew Wild <mwild1@gmail.com>
parents:
739
diff
changeset
|
54 | 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
|
55 | end |
0 | 56 | end |
36
62998e5319e3
Moved hosts to a config file, still need better config though
Matthew Wild <mwild1@gmail.com>
parents:
34
diff
changeset
|
57 | |
755
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
58 | require "util.dependencies" |
c9f4f7f08a48
Load net.server after util.dependencies to catch missing luasocket
Matthew Wild <mwild1@gmail.com>
parents:
744
diff
changeset
|
59 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
60 | local server = require "net.server" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
61 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
62 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
63 | -- Maps connections to sessions -- |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
64 | sessions = {}; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
65 | hosts = {}; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
66 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
67 | -- Load and initialise core modules -- |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
68 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
69 | require "util.import" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
70 | require "core.xmlhandlers" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
71 | require "core.rostermanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
72 | require "core.eventmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
73 | require "core.hostmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
74 | require "core.modulemanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
75 | require "core.usermanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
76 | require "core.sessionmanager" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
77 | require "core.stanza_router" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
78 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
79 | --[[ |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
80 | pcall(require, "remdebug.engine"); |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
81 | if remdebug then remdebug.engine.start() end |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
82 | ]] |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
83 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
84 | local cl = require "net.connlisteners"; |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
85 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
86 | require "util.stanza" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
87 | require "util.jid" |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
88 | |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
89 | ------------------------------------------------------------------------ |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
90 | |
576
c8442d9f02a5
Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
91 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
92 | ------------- Begin code without a home --------------------- |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
93 | |
502
21dc299387a6
Installation improvements (auto-creation of data directories)
Matthew Wild <mwild1@gmail.com>
parents:
500
diff
changeset
|
94 | 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
|
95 | require "util.datamanager".set_data_path(data_path); |
c8442d9f02a5
Move the setting of data_path to fix #unfiledbug
Matthew Wild <mwild1@gmail.com>
parents:
573
diff
changeset
|
96 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
97 | ----------- End of out-of-place code -------------- |
99
ba08b8a4eeef
Abstract connections with "connection listeners"
Matthew Wild <mwild1@gmail.com>
parents:
97
diff
changeset
|
98 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
99 | eventmanager.fire_event("server-starting"); |
133
b92493ea6fd7
Fixed: Works when LuaRocks is not present
Waqas Hussain <waqas20@gmail.com>
parents:
99
diff
changeset
|
100 | |
0 | 101 | |
218
1263896ab2f1
Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents:
206
diff
changeset
|
102 | -- setup error handling |
580
9ff2c3c87065
Some code cleaning for the main script
Matthew Wild <mwild1@gmail.com>
parents:
576
diff
changeset
|
103 | setmetatable(_G, { __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 }); |
376
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
104 | |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
105 | local global_ssl_ctx = config.get("*", "core", "ssl"); |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
106 | if global_ssl_ctx then |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
107 | local default_ssl_ctx = { mode = "server", protocol = "sslv23", capath = "/etc/ssl/certs", verify = "none"; }; |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
108 | setmetatable(global_ssl_ctx, { __index = default_ssl_ctx }); |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
109 | end |
6d87944df37c
New configmanager. Old-style config files still work, but will print a warning
Matthew Wild <mwild1@gmail.com>
parents:
359
diff
changeset
|
110 | |
218
1263896ab2f1
Reworked the way lxmppd.cfg is used
Waqas Hussain <waqas20@gmail.com>
parents:
206
diff
changeset
|
111 | -- start listening on sockets |
658
1952fdcf1017
Fix specifying ports in config, and SSL support
Matthew Wild <mwild1@gmail.com>
parents:
643
diff
changeset
|
112 | local function do_ports(option, listener, default, conntype) |
605
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
113 | local ports = config.get("*", "core", option) or default; |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
114 | --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
|
115 | |
605
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
116 | if type(ports) ~= "table" then |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
117 | 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
|
118 | else |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
119 | for _, port in ipairs(ports) do |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
120 | if type(port) ~= "number" then |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
121 | log("error", "Non-numeric "..option..": "..tostring(port)); |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
122 | else |
739
1def06cd9311
Port to new server.lua, quite some changes, but I believe everything to be working
Matthew Wild <mwild1@gmail.com>
parents:
687
diff
changeset
|
123 | cl.start(listener, { ssl = conntype ~= "tcp" and global_ssl_ctx, port = port, type = conntype }); |
605
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
124 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
125 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
126 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
127 | end |
8458be0941e7
Added: Ports now read from the config
Waqas Hussain <waqas20@gmail.com>
parents:
580
diff
changeset
|
128 | |
664
30ccc5e3d8c8
Don't use TLS connection handler when SSL/TLS not available or configured (thanks to Ricardo for finding)
Matthew Wild <mwild1@gmail.com>
parents:
658
diff
changeset
|
129 | do_ports("c2s_ports", "xmppclient", {5222}, (global_ssl_ctx and "tls") or "tcp"); |
658
1952fdcf1017
Fix specifying ports in config, and SSL support
Matthew Wild <mwild1@gmail.com>
parents:
643
diff
changeset
|
130 | do_ports("s2s_ports", "xmppserver", {5269}, "tcp"); |
1952fdcf1017
Fix specifying ports in config, and SSL support
Matthew Wild <mwild1@gmail.com>
parents:
643
diff
changeset
|
131 | do_ports("legacy_ssl_ports", "xmppclient", {}, "ssl"); |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
132 | |
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
|
133 | if config.get("*", "core", "console_enabled") then |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
134 | if cl.get("console") then |
676
5e2dfeba1f14
Default mod_console to listening on localhost only. May be changed with console_interface=xxx.xxx.xxx.xxx in the config
Matthew Wild <mwild1@gmail.com>
parents:
664
diff
changeset
|
135 | cl.start("console", { interface = config.get("*", "core", "console_interface") or "127.0.0.1" }) |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
136 | else |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
137 | log("error", "Console is enabled, but the console module appears not to be loaded"); |
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
138 | end |
383
32b586d9e915
Only start console if it is enabled in the config. Note that the exact option is going to change tomorrow.
Matthew Wild <mwild1@gmail.com>
parents:
382
diff
changeset
|
139 | end |
382 | 140 | |
569
5216efe6088b
Add hostmanager, and eventmanager
Matthew Wild <mwild1@gmail.com>
parents:
524
diff
changeset
|
141 | eventmanager.fire_event("server-started"); |
359
8fbfa8f885a6
Add event for server startup completed: server-started
Matthew Wild <mwild1@gmail.com>
parents:
260
diff
changeset
|
142 | |
1
b8787e859fd2
Switched to new connection framework, courtesy of the luadch project
matthew
parents:
0
diff
changeset
|
143 | server.loop(); |