comparison: init.lua
init.lua
- changeset 490
- 6b2f31da9610
- parent 465
- 6707e3a47f71
- child 492
- 22844ac3be4e
equal
deleted
inserted
replaced
| 489:39ed19f12dca | 490:6b2f31da9610 |
|---|---|
| 5 local socket = require"socket"; | 5 local socket = require"socket"; |
| 6 | 6 |
| 7 -- Load LuaSec if available | 7 -- Load LuaSec if available |
| 8 pcall(require, "ssl"); | 8 pcall(require, "ssl"); |
| 9 | 9 |
| 10 local server = require "net.server"; | 10 local server = require "prosody.net.server_select"; |
| 11 local events = require "util.events"; | 11 package.loaded["prosody.net.server"] = server; -- XXX |
| 12 local logger = require "util.logger"; | 12 local events = require "prosody.util.events"; |
| 13 | 13 local logger = require "prosody.util.logger"; |
| 14 local format = require "util.format".format; | 14 |
| 15 local format = require "prosody.util.format".format; | |
| 15 | 16 |
| 16 local verse = {}; | 17 local verse = {}; |
| 17 verse.server = server; | 18 verse.server = server; |
| 18 | 19 |
| 19 local stream = {}; | 20 local stream = {}; |
| 44 t.plugins = {}; | 45 t.plugins = {}; |
| 45 t.verse = verse; | 46 t.verse = verse; |
| 46 return t; | 47 return t; |
| 47 end | 48 end |
| 48 | 49 |
| 49 verse.add_task = require "util.timer".add_task; | 50 verse.add_task = require "prosody.util.timer".add_task; |
| 50 | 51 |
| 51 verse.logger = logger.init; -- COMPAT: Deprecated | 52 verse.logger = logger.init; -- COMPAT: Deprecated |
| 52 verse.new_logger = logger.init; | 53 verse.new_logger = logger.init; |
| 53 verse.log = verse.logger("verse"); | 54 verse.log = verse.logger("verse"); |
| 54 | 55 |
