Commit d929e30a authored by jan.koester's avatar jan.koester
Browse files

test

parent 590e322e

src/blogi.cpp

+9 −5
Original line number Diff line number Diff line
@@ -104,9 +104,11 @@ blogi::Blogi::Blogi(std::vector<netplus::socket*> serversocket,bool debug) : Htt 
        ctx.prefix = dcfg.prefix;

        ctx.startPage = dcfg.startPage;

        ctx.siteUrl = dcfg.siteUrl;

        ctx.config = std::make_unique<blogi::Config>(Blogi::Cfg->getConfigPath());

        ctx.config->applyDomain(dcfg);

        ctx.plgArgs = std::make_unique<PluginArgs>();

        ctx.plgArgs->debug = debug;

        ctx.plgArgs->config = Blogi::Cfg.get();

        ctx.plgArgs->config = ctx.config.get();



        std::cerr << "Initializing domain '" << dcfg.names[0] << "' with DB Driver: " << dcfg.dbDriver << " on " << dcfg.dbConnection << std::endl;
@@ -184,7 +186,7 @@ blogi::Blogi::Blogi(std::vector<netplus::socket*> serversocket,bool debug) : Htt 


        ctx.plgArgs->auth = std::make_unique<Auth>(ctx.plgArgs->database, *ctx.plgArgs->config);



        ThemeConfig tplcfg(dcfg.templatePath, ctx.plgArgs->database, *Blogi::Cfg);

        ThemeConfig tplcfg(dcfg.templatePath, ctx.plgArgs->database, *ctx.config);



        ctx.plgArgs->theme = std::make_unique<Theme>(tplcfg, debug);
@@ -247,9 +249,11 @@ bool blogi::Blogi::reloadConfig() { 
            ctx->prefix = dcfg.prefix;

            ctx->startPage = dcfg.startPage;

            ctx->siteUrl = dcfg.siteUrl;

            ctx->config = std::make_unique<blogi::Config>(configPath);

            ctx->config->applyDomain(dcfg);

            ctx->plgArgs = std::make_unique<PluginArgs>();

            ctx->plgArgs->debug = _debug;

            ctx->plgArgs->config = newCfg.get();

            ctx->plgArgs->config = ctx->config.get();



            std::cerr << "[blogi] Reload: initializing domain '" << dcfg.names[0] << "'" << std::endl;
@@ -300,9 +304,9 @@ bool blogi::Blogi::reloadConfig() { 
                getConfig(*initdb, "SMTPPASSWORD", ctx->plgArgs->smtp->_SPass);

            } catch (...) {}



            ctx->plgArgs->auth = std::make_unique<Auth>(ctx->plgArgs->database, *newCfg);

            ctx->plgArgs->auth = std::make_unique<Auth>(ctx->plgArgs->database, *ctx->config);



            ThemeConfig tplcfg(dcfg.templatePath, ctx->plgArgs->database, *newCfg);

            ThemeConfig tplcfg(dcfg.templatePath, ctx->plgArgs->database, *ctx->config);

            ctx->plgArgs->theme = std::make_unique<Theme>(tplcfg, _debug);



            try {