nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check that we can write to the logfile and log a warning to stderr if we can't

Browse Source 
Move writing of pidfile after daemonizing, and also after setting the [ug]id:
This means that the tor user needs write priviliges to the pidfile location.
It needs it for unlinking the pidfile anyway.


svn:r846
This commit is contained in:
Peter Palfrader 2003-11-19 02:09:43 +00:00
parent 3d145769de
commit 9a676b04dd
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/log.c
View File

@ -150,6 +150,10 @@ void add_stream_log(int loglevel, const char *name, FILE *stream)
logfiles = lf;
}
/*
* If opening the logfile fails, -1 is returned and
* errno is set appropriately (by fopen)
*/
int add_file_log(int loglevel, const char *filename)
{
FILE *f;

20
src/or/main.c
View File

@ -602,19 +602,19 @@ static int init_from_config(int argc, char **argv) {
close_logs(); /* we'll close, then open with correct loglevel if necessary */
if(!options.LogFile && !options.RunAsDaemon)
add_stream_log(options.loglevel, "<stdout>", stdout);
if(options.DebugLogFile)
add_file_log(LOG_DEBUG, options.DebugLogFile);
if(options.LogFile)
add_file_log(options.loglevel, options.LogFile);
if (add_file_log(options.loglevel, options.LogFile) != 0) {
/* opening the log file failed! Use stderr and log a warning */
add_stream_log(options.loglevel, "<stderr>", stderr);
log_fn(LOG_WARN, "Cannot write to LogFile '%s': %s.", options.LogFile, strerror(errno));
}
if(options.DebugLogFile)
if (add_file_log(LOG_DEBUG, options.DebugLogFile) != 0)
log_fn(LOG_WARN, "Cannot write to DebugLogFile '%s': %s.", options.LogFile, strerror(errno));
global_read_bucket = options.TotalBandwidth; /* start it at 1 second of traffic */
stats_prev_global_read_bucket = global_read_bucket;
/* write our pid to the pid file */
write_pidfile(options.PidFile);
/* XXX Is overwriting the pidfile ok? I think it is. -RD */
/* now that we've written the pid file, we can switch the user and group. */
if(options.User || options.Group) {
if(switch_id(options.User, options.Group) != 0) {
return -1;
@ -626,6 +626,10 @@ static int init_from_config(int argc, char **argv) {
have_daemonized = 1;
}
/* write our pid to the pid file, if we do not have write permissions we will log a warning */
write_pidfile(options.PidFile);
/* XXX Is overwriting the pidfile ok? I think it is. -RD */
return 0;
}