Browse Source

control logs destination through -log parameter

pull/352/head
orignal 9 years ago
parent
commit
6d8b0e3a5d
  1. 9
      Daemon.cpp
  2. 5
      docs/configuration.md

9
Daemon.cpp

@ -68,7 +68,7 @@ namespace i2p
i2p::util::config::ReadConfigFile(i2p::util::filesystem::GetConfigFile()); i2p::util::config::ReadConfigFile(i2p::util::filesystem::GetConfigFile());
isDaemon = i2p::util::config::GetArg("-daemon", 0); isDaemon = i2p::util::config::GetArg("-daemon", 0);
isLogging = i2p::util::config::GetArg("-log", 1); isLogging = i2p::util::config::GetArg("-log", (int)isDaemon);
int port = i2p::util::config::GetArg("-port", 0); int port = i2p::util::config::GetArg("-port", 0);
if (port) if (port)
@ -104,8 +104,6 @@ namespace i2p
{ {
// initialize log // initialize log
if (isLogging) if (isLogging)
{
if (isDaemon)
{ {
std::string logfile_path = IsService () ? "/var/log/i2pd" : i2p::util::filesystem::GetDataDir().string(); std::string logfile_path = IsService () ? "/var/log/i2pd" : i2p::util::filesystem::GetDataDir().string();
#ifndef _WIN32 #ifndef _WIN32
@ -114,11 +112,10 @@ namespace i2p
logfile_path.append("\\i2pd.log"); logfile_path.append("\\i2pd.log");
#endif #endif
StartLog (logfile_path); StartLog (logfile_path);
} else {
StartLog (""); // write to stdout
} }
else
StartLog (""); // write to stdout
g_Log->SetLogLevel(i2p::util::config::GetArg("-loglevel", "info")); g_Log->SetLogLevel(i2p::util::config::GetArg("-loglevel", "info"));
}
std::string httpAddr = i2p::util::config::GetArg("-httpaddress", "127.0.0.1"); std::string httpAddr = i2p::util::config::GetArg("-httpaddress", "127.0.0.1");
uint16_t httpPort = i2p::util::config::GetArg("-httpport", 7070); uint16_t httpPort = i2p::util::config::GetArg("-httpport", 7070);

5
docs/configuration.md

@ -4,14 +4,13 @@ i2pd configuration
Command line options Command line options
-------------------- --------------------
* --host= - The external IP (deprecated).
* --port= - The port to listen on * --port= - The port to listen on
* --httpaddress= - The address to listen on (HTTP server) * --httpaddress= - The address to listen on (HTTP server)
* --httpport= - The port to listen on (HTTP server) * --httpport= - The port to listen on (HTTP server)
* --log= - Enable or disable logging to file. 1 for yes, 0 for no.
* --loglevel= - Log messages above this level (debug, *info, warn, error) * --loglevel= - Log messages above this level (debug, *info, warn, error)
* --pidfile= - Where to write pidfile (dont write by default) * --pidfile= - Where to write pidfile (dont write by default)
* --daemon= - Enable or disable daemon mode. 1 for yes, 0 for no. * --daemon= - Enable or disable daemon mode. 1 for yes, 0 for no. 0 by default
* --log= - Enable or disable logging to the file. 1 for daemon, 0 for non-daemon by default
* --svcctl= - Windows service management (--svcctl="install" or --svcctl="remove") * --svcctl= - Windows service management (--svcctl="install" or --svcctl="remove")
* --service= - 1 if uses system folders (/var/run/i2pd.pid, /var/log/i2pd/i2pd.log, /var/lib/i2pd). * --service= - 1 if uses system folders (/var/run/i2pd.pid, /var/log/i2pd/i2pd.log, /var/lib/i2pd).
* --v6= - 1 if supports communication through ipv6, off by default * --v6= - 1 if supports communication through ipv6, off by default

Loading…
Cancel
Save