From b99313a73a915fbe30f512cf3cca89a4b5e4ce8c Mon Sep 17 00:00:00 2001
From: HanzZ <hanzz.k@gmail.com>
Date: Mon, 14 Nov 2011 20:11:30 +0100
Subject: [PATCH] Create logging dir and change owner to user we run as

---
 spectrum/src/main.cpp | 93 +++++++++++++++++++++++++++++++------------
 1 file changed, 67 insertions(+), 26 deletions(-)

diff --git a/spectrum/src/main.cpp b/spectrum/src/main.cpp
index c52011f5..4e93edb5 100644
--- a/spectrum/src/main.cpp
+++ b/spectrum/src/main.cpp
@@ -12,6 +12,7 @@
 #include "transport/util.h"
 #include "Swiften/EventLoop/SimpleEventLoop.h"
 #include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
 #ifndef WIN32
 #include "sys/signal.h"
 #include <pwd.h>
@@ -205,6 +206,72 @@ int main(int argc, char **argv)
     }
 #endif
 
+	if (CONFIG_STRING(&config, "logging.config").empty()) {
+		LoggerPtr root = log4cxx::Logger::getRootLogger();
+#ifdef WIN32
+		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
+#else
+		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
+#endif
+	}
+	else {
+		log4cxx::helpers::Properties p;
+		log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.config"));
+
+		p.load(istream);
+		LogString pid, jid;
+		log4cxx::helpers::Transcoder::decode(boost::lexical_cast<std::string>(getpid()), pid);
+		log4cxx::helpers::Transcoder::decode(CONFIG_STRING(&config, "service.jid"), jid);
+#ifdef WIN32
+		p.setProperty(L"pid", pid);
+		p.setProperty(L"jid", jid);
+#else
+		p.setProperty("pid", pid);
+		p.setProperty("jid", jid);
+#endif
+
+		std::string dir;
+		BOOST_FOREACH(const log4cxx::LogString &prop, p.propertyNames()) {
+			if (boost::ends_with(prop, ".File")) {
+				dir = p.get(prop);
+				boost::replace_all(dir, "{$jid}", jid);
+				break;
+			}
+		}
+
+		if (!dir.empty()) {
+			// create directories
+			try {
+				boost::filesystem::create_directories(
+					boost::filesystem::path(dir).parent_path().string()
+				);
+			}
+			catch (...) {
+				std::cerr << "Can't create logging directory directory " << boost::filesystem::path(dir).parent_path().string() << ".\n";
+				return 1;
+			}
+
+#ifndef WIN32
+			if (!CONFIG_STRING(&config, "service.group").empty() && !CONFIG_STRING(&config, "service.user").empty()) {
+				struct group *gr;
+				if ((gr = getgrnam(CONFIG_STRING(&config, "service.group").c_str())) == NULL) {
+					std::cerr << "Invalid service.group name " << CONFIG_STRING(&config, "service.group") << "\n";
+					return 1;
+				}
+				struct passwd *pw;
+				if ((pw = getpwnam(CONFIG_STRING(&config, "service.user").c_str())) == NULL) {
+					std::cerr << "Invalid service.user name " << CONFIG_STRING(&config, "service.user") << "\n";
+					return 1;
+				}
+				chown(dir.c_str(), pw->pw_uid, gr->gr_gid);
+			}
+
+#endif
+		}
+
+		log4cxx::PropertyConfigurator::configure(p);
+	}
+
 #ifndef WIN32
 	if (!CONFIG_STRING(&config, "service.group").empty() ||!CONFIG_STRING(&config, "service.user").empty() ) {
 		struct rlimit limit;
@@ -253,32 +320,6 @@ int main(int argc, char **argv)
 	}
 #endif
 
-	if (CONFIG_STRING(&config, "logging.config").empty()) {
-		LoggerPtr root = log4cxx::Logger::getRootLogger();
-#ifdef WIN32
-		root->addAppender(new ConsoleAppender(new PatternLayout(L"%d %-5p %c: %m%n")));
-#else
-		root->addAppender(new ConsoleAppender(new PatternLayout("%d %-5p %c: %m%n")));
-#endif
-	}
-	else {
-		log4cxx::helpers::Properties p;
-		log4cxx::helpers::FileInputStream *istream = new log4cxx::helpers::FileInputStream(CONFIG_STRING(&config, "logging.config"));
-
-		p.load(istream);
-		LogString pid, jid;
-		log4cxx::helpers::Transcoder::decode(boost::lexical_cast<std::string>(getpid()), pid);
-		log4cxx::helpers::Transcoder::decode(CONFIG_STRING(&config, "service.jid"), jid);
-#ifdef WIN32
-		p.setProperty(L"pid", pid);
-		p.setProperty(L"jid", jid);
-#else
-		p.setProperty("pid", pid);
-		p.setProperty("jid", jid);
-#endif
-		log4cxx::PropertyConfigurator::configure(p);
-	}
-
 	Swift::SimpleEventLoop eventLoop;
 
 	Swift::BoostNetworkFactories *factories = new Swift::BoostNetworkFactories(&eventLoop);