diff options
| author |  Sadie Powell | 2021-01-18 10:30:22 +0000 |
|---|---|---|
| committer | Sadie Powell | 2021-01-18 11:42:25 +0000 |
| commit | db0052bcc23f8c8bc5d152d7ebbdda492b56cc4c (patch) | |
| tree | a18c79a7453fc41665b43e3e77f47f164834e2b4 /src/inspircd.cpp | |
| parent | Merge branch 'insp3' into master. (diff) | |
| parent | Add a separate stats class for DNSBL errors. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'src/inspircd.cpp')
| -rw-r--r-- | src/inspircd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/inspircd.cpp b/src/inspircd.cpp index a33ec4bc3..8c3503410 100644 --- a/src/inspircd.cpp +++ b/src/inspircd.cpp @@ -332,7 +332,7 @@ namespace if (do_version) { - std::cout << std::endl << INSPIRCD_VERSION << std::endl; + std::cout << INSPIRCD_VERSION << std::endl; ServerInstance->Exit(EXIT_STATUS_NOERROR); } @@ -446,7 +446,7 @@ void InspIRCd::WritePID(bool exitonfail) } const std::string pidfile = ServerInstance->Config->ConfValue("pid")->getString("file", "inspircd.pid", 1); - std::ofstream outfile(ServerInstance->Config->Paths.PrependData(pidfile)); + std::ofstream outfile(ServerInstance->Config->Paths.PrependRuntime(pidfile)); if (outfile.is_open()) { outfile << getpid(); @@ -485,6 +485,7 @@ InspIRCd::InspIRCd(int argc, char** argv) this->Config->cmdline.argv = argv; this->Config->cmdline.argc = argc; + ParseOptions(); #ifdef _WIN32 // Initialize the console values @@ -516,7 +517,6 @@ InspIRCd::InspIRCd(int argc, char** argv) << "See " << con_green << "/INFO" << con_reset << " for contributors & authors" << std::endl << std::endl; - ParseOptions(); if (Config->cmdline.forcedebug) { FileWriter* fw = new FileWriter(stdout, 1); |