prosody
2fdeb979cc7c
util/startup.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Comparison

util/startup.lua @ 8748:2fdeb979cc7c

util.startup: Initialize logging immediately after configuration is read (which is how it used to work)
author Matthew Wild <mwild1@gmail.com>
date Tue, 10 Apr 2018 20:39:05 +0100
parent 8734:36d49a9c5e88
child 8755:857d8f38a010
comparison
equal deleted inserted replaced
8747:f91d45a692f0 8748:2fdeb979cc7c
503 503
504 -- prosodyctl only 504 -- prosodyctl only
505 function startup.prosodyctl() 505 function startup.prosodyctl()
506 startup.init_global_state(); 506 startup.init_global_state();
507 startup.read_config(); 507 startup.read_config();
508 startup.init_logging();
508 startup.setup_plugindir(); 509 startup.setup_plugindir();
509 startup.setup_datadir(); 510 startup.setup_datadir();
510 startup.chdir(); 511 startup.chdir();
511 startup.read_version(); 512 startup.read_version();
512 startup.switch_user(); 513 startup.switch_user();
513 startup.check_dependencies(); 514 startup.check_dependencies();
514 startup.force_console_logging(); 515 startup.force_console_logging();
515 startup.init_logging();
516 startup.log_dependency_warnings(); 516 startup.log_dependency_warnings();
517 startup.check_unwriteable(); 517 startup.check_unwriteable();
518 startup.load_libraries(); 518 startup.load_libraries();
519 startup.init_http_client(); 519 startup.init_http_client();
520 startup.make_dummy_hosts(); 520 startup.make_dummy_hosts();
524 function startup.prosody() 524 function startup.prosody()
525 -- These actions are in a strict order, as many depend on 525 -- These actions are in a strict order, as many depend on
526 -- previous steps to have already been performed 526 -- previous steps to have already been performed
527 startup.init_global_state(); 527 startup.init_global_state();
528 startup.read_config(); 528 startup.read_config();
529 startup.init_logging();
529 startup.sanity_check(); 530 startup.sanity_check();
530 startup.sandbox_require(); 531 startup.sandbox_require();
531 startup.set_function_metatable(); 532 startup.set_function_metatable();
532 startup.check_dependencies(); 533 startup.check_dependencies();
533 startup.init_logging(); 534 startup.init_logging();