summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>2008-05-04 01:06:02 +0000
committeraquanight <aquanight@e03df62e-2008-0410-955e-edbf42e46eb7>2008-05-04 01:06:02 +0000
commit1c0efd2f569ebcb725d361d3b9a8e31532f7a071 (patch)
treefc016dad0d258dba5c9959dec86ead5116cd9913
parent907b61918ff304708892b756ce62891c5435877a (diff)
Comment and improve check for access to ~/.inspircd/startup.log
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@9606 e03df62e-2008-0410-955e-edbf42e46eb7
-rw-r--r--src/helperfuncs.cpp22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/helperfuncs.cpp b/src/helperfuncs.cpp
index d0bffc7dc..0edb09084 100644
--- a/src/helperfuncs.cpp
+++ b/src/helperfuncs.cpp
@@ -308,10 +308,29 @@ bool InspIRCd::OpenLog(char**, int)
if (Config->logpath.empty())
{
std::string path = std::string(home) + "/.inspircd";
+ // This tries to create the ~/.inspircd. If it succeeds, then we go ahead and use it.
+ // If it fails due to an existing target, then we use it anyway.
+ // Either way, we make sure we can get write access to the log at this point.
if (!mkdir(path.c_str(), 0700) || errno == EEXIST)
{
/* Log to ~/.inspircd/ircd.log */
Config->logpath = path + "/startup.log";
+ FILE* fd = fopen(Config->logpath.c_str(), "a+");
+ if (!fd)
+ {
+ // Could not get write access... Why?
+ if (errno == ENOTDIR)
+ // ~/.inspircd is not actually a directory!
+ printf("\nWARNING: Unable to create directory: %s (Exists and is not a directory)\n", path.c_str());
+ else
+ // Not writable for some other reason (no +w access, readonly fs, file too big, whatever).
+ printf("\nWARNING: No write access to %s (%s)\n", Config->logpath.c_str(), strerror(errno));
+ Config->logpath = "./startup.log";
+ }
+ else
+ {
+ Config->log_file = fd;
+ }
}
else
{
@@ -321,7 +340,8 @@ bool InspIRCd::OpenLog(char**, int)
}
}
- Config->log_file = fopen(Config->logpath.c_str(),"a+");
+ if (!Config->log_file)
+ Config->log_file = fopen(Config->logpath.c_str(),"a+");
}
else
{