Browse Source

update info about pidfile defaults (closes #1136)

Signed-off-by: R4SAS <r4sas@i2pmail.org>
pull/1515/head
R4SAS 5 years ago
parent
commit
16b992d705
Signed by: r4sas
GPG Key ID: 66F6C87B98EBCFE2
  1. 2
      contrib/i2pd.conf
  2. 3
      daemon/UnixDaemon.cpp
  3. 6
      daemon/i2pd.cpp

2
contrib/i2pd.conf

@ -15,7 +15,7 @@
## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d ## Default: ~/.i2pd/tunnels.d or /var/lib/i2pd/tunnels.d
# tunnelsdir = /var/lib/i2pd/tunnels.d # tunnelsdir = /var/lib/i2pd/tunnels.d
## Where to write pidfile (don't write by default) ## Where to write pidfile (default: i2pd.pid, not used in Windows)
# pidfile = /run/i2pd.pid # pidfile = /run/i2pd.pid
## Logging configuration section ## Logging configuration section

3
daemon/UnixDaemon.cpp

@ -167,7 +167,7 @@ namespace i2p
sigaction(SIGABRT, &sa, 0); sigaction(SIGABRT, &sa, 0);
sigaction(SIGTERM, &sa, 0); sigaction(SIGTERM, &sa, 0);
sigaction(SIGINT, &sa, 0); sigaction(SIGINT, &sa, 0);
sigaction(SIGPIPE, &sa, 0); sigaction(SIGPIPE, &sa, 0);
return Daemon_Singleton::start(); return Daemon_Singleton::start();
} }
@ -175,7 +175,6 @@ namespace i2p
bool DaemonLinux::stop() bool DaemonLinux::stop()
{ {
i2p::fs::Remove(pidfile); i2p::fs::Remove(pidfile);
return Daemon_Singleton::stop(); return Daemon_Singleton::stop();
} }

6
daemon/i2pd.cpp

@ -7,18 +7,18 @@ namespace i2p
{ {
namespace qt namespace qt
{ {
int RunQT (int argc, char* argv[]); int RunQT (int argc, char* argv[]);
} }
} }
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
{ {
return i2p::qt::RunQT (argc, argv); return i2p::qt::RunQT (argc, argv);
} }
#else #else
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
{ {
if (Daemon.init(argc, argv)) if (Daemon.init(argc, argv))
{ {
if (Daemon.start()) if (Daemon.start())
Daemon.run (); Daemon.run ();

Loading…
Cancel
Save