darlinghq/darlingserver
1
0
Fork 0
mirror of https://github.com/darlinghq/darlingserver.git synced 2024-11-26 22:00:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[log] Add mode argument and check for success

Browse Source 
Make sure to pass a file mode argument to `open` (this is required with `O_CREAT`. Also, make sure to check for success (i.e. non-negative FD) before trying to using the log file.
This commit is contained in:
Ariel Abreu 2023-06-29 09:33:41 -04:00 committed by GitHub
parent ce156a461f
commit a88ba44119
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/logging.cpp
View File

@ -24,6 +24,7 @@
#include <filesystem>
#include <fcntl.h>
#include <unistd.h>
#include <sys/stat.h>
#define DEFAULT_LOG_CUTOFF DarlingServer::Log::Type::Error
@ -103,7 +104,7 @@ void DarlingServer::Log::_log(Type type, std::string message) const {
static int logFile = []() {
std::filesystem::path path(Server::sharedInstance().prefix() + "/private/var/log/dserver.log");
std::filesystem::create_directories(path.parent_path());
return open(path.c_str(), O_WRONLY | O_APPEND | O_CREAT);
return open(path.c_str(), O_WRONLY | O_APPEND | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
}();
static bool logToStderr = []() {
@ -128,7 +129,7 @@ void DarlingServer::Log::_log(Type type, std::string message) const {
return level;
}();
if (type < logMinLevel && !_alwaysLog) {
if ((type < logMinLevel && !_alwaysLog) || logFile < 0) {
return;
}