Mercurial > lxmppd-hg-xmllex / file comparison
comparison: prosody
prosody
- changeset 2514
- 163b2aef5aff
- parent 2510
- 97b5ea975cb9
- child 2548
- e12acef85166
equal
deleted
inserted
replaced
| 2513:a8aa7616b154 | 2514:163b2aef5aff |
|---|---|
| 30 if os.getenv("HOME") then | 30 if os.getenv("HOME") then |
| 31 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); | 31 CFG_DATADIR = CFG_DATADIR:gsub("^~", os.getenv("HOME")); |
| 32 end | 32 end |
| 33 end | 33 end |
| 34 | 34 |
| 35 -- Required to be able to find packages installed with luarocks | 35 -- Check runtime dependencies |
| 36 pcall(require, "luarocks.require"); | 36 if not require "util.dependencies".check_dependencies() then |
| 37 os.exit(1); | |
| 38 end | |
| 37 | 39 |
| 38 -- Replace require() with one that doesn't pollute _G, required | 40 -- Replace require() with one that doesn't pollute _G, required |
| 39 -- for neat sandboxing of modules | 41 -- for neat sandboxing of modules |
| 40 do | 42 do |
| 41 local _realG = _G; | 43 local _realG = _G; |
| 110 end | 112 end |
| 111 | 113 |
| 112 function load_libraries() | 114 function load_libraries() |
| 113 -- Initialize logging | 115 -- Initialize logging |
| 114 require "core.loggingmanager" | 116 require "core.loggingmanager" |
| 115 | |
| 116 -- Check runtime dependencies | |
| 117 if not require "util.dependencies".check_dependencies() then | |
| 118 os.exit(1); | |
| 119 end | |
| 120 | 117 |
| 121 -- Load socket framework | 118 -- Load socket framework |
| 122 server = require "net.server" | 119 server = require "net.server" |
| 123 end | 120 end |
| 124 | 121 |
