Software /
code /
prosody
Comparison
util/startup.lua @ 12802:4a8740e01813
Merge 0.12->trunk
author | Kim Alvefur <zash@zash.se> |
---|---|
date | Mon, 12 Dec 2022 07:10:54 +0100 |
parent | 12782:8815d3090928 |
child | 12864:9f9633364044 |
comparison
equal
deleted
inserted
replaced
12801:ebd6b4d8bf04 | 12802:4a8740e01813 |
---|---|
275 prosody.log = logger.init("general"); | 275 prosody.log = logger.init("general"); |
276 | 276 |
277 startup.detect_platform(); | 277 startup.detect_platform(); |
278 startup.detect_installed(); | 278 startup.detect_installed(); |
279 _G.prosody = prosody; | 279 _G.prosody = prosody; |
280 | |
281 -- COMPAT Lua < 5.3 | |
282 if not math.type then | |
283 require "util.mathcompat" | |
284 end | |
280 end | 285 end |
281 | 286 |
282 function startup.setup_datadir() | 287 function startup.setup_datadir() |
283 prosody.paths.data = config.get("*", "data_path") or CFG_DATADIR or "data"; | 288 prosody.paths.data = config.get("*", "data_path") or CFG_DATADIR or "data"; |
284 end | 289 end |