Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

issue #122: arangod doesn't start if <log.file> cannot be created

This commit is contained in:
Jan Steemann 2012-07-04 13:34:26 +02:00
parent f7be68bd47
commit d9227ac680
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ApplicationServer/ApplicationServer.cpp
View File

@ -241,7 +241,14 @@ void ApplicationServer::setupLogging () {
TRI_SetFileToLog(i->c_str()); TRI_SetFileToLog(i->c_str());
} }
TRI_CreateLogAppenderFile(_logFile); if (NULL == TRI_CreateLogAppenderFile(_logFile)) {
if (_logFile.length() > 0) {
// the user specified a log file to use but it could not be created. bail out
std::cerr << "failed to create logfile " << _logFile << std::endl;
exit(EXIT_FAILURE);
}
}
TRI_CreateLogAppenderSyslog(_logPrefix, _logSyslog); TRI_CreateLogAppenderSyslog(_logPrefix, _logSyslog);
#ifdef TRI_HAVE_SETGID #ifdef TRI_HAVE_SETGID

11
lib/BasicsC/logging.c
View File

@ -1347,6 +1347,11 @@ TRI_log_appender_t* TRI_CreateLogAppenderFile (char const* filename) {
// allocate space // allocate space
appender = TRI_Allocate(TRI_CORE_MEM_ZONE, sizeof(log_appender_file_t), false); appender = TRI_Allocate(TRI_CORE_MEM_ZONE, sizeof(log_appender_file_t), false);
if (appender == NULL) {
TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY);
return NULL;
}
// logging to stdout // logging to stdout
if (TRI_EqualString(filename, "+")) { if (TRI_EqualString(filename, "+")) {
@ -1372,6 +1377,12 @@ TRI_log_appender_t* TRI_CreateLogAppenderFile (char const* filename) {
TRI_SetCloseOnExecFile(appender->_fd); TRI_SetCloseOnExecFile(appender->_fd);
appender->_filename = TRI_DuplicateString(filename); appender->_filename = TRI_DuplicateString(filename);
if (appender->_filename == NULL) {
TRI_set_errno(TRI_ERROR_OUT_OF_MEMORY);
TRI_Free(TRI_CORE_MEM_ZONE, appender);
return NULL;
}
} }
// set methods // set methods