diff options
| -rw-r--r-- | include/anope.h | 2 | ||||
| -rw-r--r-- | src/init.cpp | 6 | ||||
| -rw-r--r-- | src/main.cpp | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/include/anope.h b/include/anope.h index e1505652a..942952857 100644 --- a/include/anope.h +++ b/include/anope.h @@ -375,7 +375,7 @@ namespace Anope /** Other command line options. */ - extern CoreExport bool ReadOnly, NoFork, NoThird, NoExpire, ProtocolDebug; + extern CoreExport bool ReadOnly, NoFork, NoThird, NoPID, NoExpire, ProtocolDebug; /** The root of the Anope installation. Usually ~/anope */ diff --git a/src/init.cpp b/src/init.cpp index 8bf7d387c..df53ee908 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -221,7 +221,7 @@ static void remove_pidfile() static void write_pidfile() { auto pidfile = Anope::ExpandData(Config->GetBlock("serverinfo")->Get<const Anope::string>("pid")); - if (pidfile.empty()) + if (Anope::NoPID || pidfile.empty()) return; std::ofstream stream(pidfile.str()); @@ -325,6 +325,7 @@ bool Anope::Init(int ac, char **av) Log(LOG_TERMINAL) << " --modulesdir=modules directory"; Log(LOG_TERMINAL) << "-e, --noexpire"; Log(LOG_TERMINAL) << "-n, --nofork"; + Log(LOG_TERMINAL) << "-p, --nopid"; Log(LOG_TERMINAL) << " --nothird"; Log(LOG_TERMINAL) << " --protocoldebug"; Log(LOG_TERMINAL) << "-r, --readonly"; @@ -352,6 +353,9 @@ bool Anope::Init(int ac, char **av) if (GetCommandLineArgument("nothird")) Anope::NoThird = true; + if (GetCommandLineArgument("nopid", 'p')) + Anope::NoPID = true; + if (GetCommandLineArgument("noexpire", 'e')) Anope::NoExpire = true; diff --git a/src/main.cpp b/src/main.cpp index 7106579c0..498378c43 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -24,7 +24,7 @@ /* Command-line options: */ int Anope::Debug = 0; -bool Anope::ReadOnly = false, Anope::NoFork = false, Anope::NoThird = false, Anope::NoExpire = false, Anope::ProtocolDebug = false; +bool Anope::ReadOnly = false, Anope::NoFork = false, Anope::NoThird = false, Anope::NoPID = false, Anope::NoExpire = false, Anope::ProtocolDebug = false; Anope::string Anope::ServicesDir; Anope::string Anope::ServicesBin; |