Merge remote-tracking branch 'sunshine/master'

This commit is contained in:
Yukino Song
2025-04-01 20:05:27 +08:00
21 changed files with 270 additions and 72 deletions

View File

@@ -108,10 +108,6 @@ int main(int argc, char *argv[]) {
mail::man = std::make_shared<safe::mail_raw_t>();
if (config::parse(argc, argv)) {
return 0;
}
auto log_deinit_guard = logging::init(config::sunshine.min_log_level, config::sunshine.log_file);
if (!log_deinit_guard) {
BOOST_LOG(error) << "Logging failed to initialize"sv;
@@ -125,6 +121,11 @@ int main(int argc, char *argv[]) {
// Log publisher metadata
log_publisher_data();
// parse config file
if (config::parse(argc, argv)) {
return 0;
}
if (!config::sunshine.cmd.name.empty()) {
auto fn = cmd_to_func.find(config::sunshine.cmd.name);
if (fn == std::end(cmd_to_func)) {