|
|
@ -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); |
|
|
|