Removed the --log command line option because its no longer necessary, and updated example.conf

4 files changed, 2 insertions, 16 deletions

diff --git a/data/example.conf b/data/example.conf
index b98595ef7..5bc72c40c 100644
--- a/data/example.conf
+++ b/data/example.conf
@@ -129,15 +129,13 @@ serverinfo
 	/*
 	 * The hostname that Services will be seen as, it must have no conflicts with any
 	 * other server names on the rest of your IRC network. Note that it does not have
-	 * to be an existing hostname, just one that isn't on your network already. This
-	 * can be overridden with the -name command-line option when starting Services.
+	 * to be an existing hostname, just one that isn't on your network already.
 	 */
 	name = "services.localhost.net"
 
 	/*
 	 * The text which should appear as the server's information in /whois and similar
-	 * queries. This can be overridden by the -desc command-line option when starting
-	 * Services.
+	 * queries.
 	 */
 	description = "Services for IRC Networks"
 
@@ -174,8 +172,6 @@ serverinfo
 
 	/*
 	 * These identify the ident@hostname which will be used by the Services pesudoclients.
-	 * They can be overridden by the -user and -host command-line options when starting
-	 * Services.
 	 */
 	ident = "services"
 	hostname = "localhost.net"
diff --git a/include/extern.h b/include/extern.h
index febc0c5c5..e0e6a6a9b 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -179,7 +179,6 @@ E void InitLogChannels(ServerConfig *);
 /**** main.c ****/
 
 E Anope::string services_dir;
-E Anope::string log_filename;
 E int debug;
 E bool readonly;
 E bool nofork;
diff --git a/src/init.cpp b/src/init.cpp
index 0f6163dd4..1de213a11 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -235,7 +235,6 @@ void Init(int ac, char **av)
 		Log(LOG_TERMINAL) << "-d, --debug[=level]";
 		Log(LOG_TERMINAL) << "    --dir=services_directory";
 		Log(LOG_TERMINAL) << "-h, --help";
-		Log(LOG_TERMINAL) << "    --log=log_filename";
 		Log(LOG_TERMINAL) << "-e, --noexpire";
 		Log(LOG_TERMINAL) << "-n, --nofork";
 		Log(LOG_TERMINAL) << "    --nothird";
@@ -299,13 +298,6 @@ void Init(int ac, char **av)
 		services_dir = Arg;
 	}
 
-	if (GetCommandLineArgument("log", 0, Arg))
-	{
-		if (Arg.empty())
-			throw FatalException("The --log option requires a file name");
-		log_filename = Arg;
-	}
-
 	/* Chdir to Services data directory. */
 	if (chdir(services_dir.c_str()) < 0)
 	{
diff --git a/src/main.cpp b/src/main.cpp
index b7fd536e9..26ebd65ba 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -40,7 +40,6 @@
 Anope::string services_dir;	/* -dir dirname */
 Anope::string services_bin;	/* Binary as specified by the user */
 Anope::string orig_cwd;		/* Original current working directory */
-Anope::string log_filename = "services.log"; /* -log filename */
 int debug = 0;				/* -debug */
 bool readonly = false;		/* -readonly */
 bool nofork = false;		/* -nofork */