Mercurial > lxmppd-hg-xmllex / file comparison
comparison: prosody
prosody
- changeset 882
- e362bafbbb68
- parent 853
- c0a40522041e
- child 894
- 2c0b9e3c11c3
equal
deleted
inserted
replaced
| 881:c508fb40552a | 882:e362bafbbb68 |
|---|---|
| 30 -- Required to be able to find packages installed with luarocks | 30 -- Required to be able to find packages installed with luarocks |
| 31 pcall(require, "luarocks.require") | 31 pcall(require, "luarocks.require") |
| 32 | 32 |
| 33 | 33 |
| 34 config = require "core.configmanager" | 34 config = require "core.configmanager" |
| 35 log = require "util.logger".init("general"); | |
| 36 | |
| 37 -- Disable log output, needs to read from config | |
| 38 -- require "util.logger".setwriter(function () end); | |
| 39 | 35 |
| 40 do | 36 do |
| 41 -- TODO: Check for other formats when we add support for them | 37 -- TODO: Check for other formats when we add support for them |
| 42 -- Use lfs? Make a new conf/ dir? | 38 -- Use lfs? Make a new conf/ dir? |
| 43 local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); | 39 local ok, level, err = config.load((CFG_CONFIGDIR or ".").."/prosody.cfg.lua"); |
| 60 print("**************************"); | 56 print("**************************"); |
| 61 print(""); | 57 print(""); |
| 62 os.exit(1); | 58 os.exit(1); |
| 63 end | 59 end |
| 64 end | 60 end |
| 61 | |
| 62 log = require "util.logger".init("general"); | |
| 63 | |
| 64 -- Disable log output, needs to read from config | |
| 65 -- require "util.logger".setwriter(function () end); | |
| 65 | 66 |
| 66 require "util.dependencies" | 67 require "util.dependencies" |
| 67 | 68 |
| 68 local server = require "net.server" | 69 local server = require "net.server" |
| 69 | 70 |
