Logging to file

conf/settings-default.toml

@@ -66,3 +66,9 @@ location= "tcp:127.0.0.1:10200" # The connection string for the R-Operator to us
 
 [uploader]
 directory="uploader" # The name of the directory where the uploader stores the files
+
+[log]
+logtofile=false # If logs should be written to file instead of error stream
+#logfilelocation="" # Location to store the logs
+logfilelevel="DEBUG" # The maximum level to be logged to file
+cgilogfilename="gci_logs.txt" # The name for CGI log file, that is shared between program instances.

src/cgi.cpp

@@ -44,7 +44,12 @@ JPEG32: 120703 (90%)
  * A thread function that handles fcgi request
  */
 void fcgiThread(int fd) {
-	FCGX_Init();
+    std::stringstream id_stream;
+    id_stream << std::this_thread::get_id();
+    std::string thread_id(id_stream.str());
+    Log::debug("Start of thread: " + thread_id);
+
+    FCGX_Init();
 
 	FCGX_Request request;
 
@@ -54,14 +59,26 @@ void fcgiThread(int fd) {
 		fcgi_streambuf streambuf_in(request.in);
 		fcgi_streambuf streambuf_out(request.out);
 		fcgi_streambuf streambuf_err(request.err);
-
+		Log::setThreadRequestId(request.requestId);
+        char * ip_ptr = FCGX_GetParam("REMOTE_ADDR", request.envp);
+        std::string ip = ip_ptr != nullptr ? ip_ptr : "";
+		Log::debug(concat("New request ", request.requestId, " from ip ", ip,  ", on thread ", thread_id));
 		HTTPService::run(&streambuf_in, &streambuf_out, &streambuf_err, request);
+		Log::debug(concat("Finished request ", request.requestId));
 	}
+    Log::debug("End of thread: " + thread_id);
 }
 
 int main() {
 	Configuration::loadFromDefaultPaths();
-	Log::off();
+	Log::streamAndMemoryOff();
+
+	const bool isCgiMode = getenv("FCGI_WEB_SERVER_ADDRS") == nullptr;
+
+	if(Configuration::get<bool>("log.logtofile")){
+		Log::logToFile(isCgiMode);
+		Log::logRequestId(true);
+	}
 
 	/*
 	 * Initialize Cache
@@ -107,9 +124,13 @@ int main() {
 	FeatureCollectionDB::initFromConfiguration();
 
 
-	if (getenv("FCGI_WEB_SERVER_ADDRS") == nullptr) {
+	if (isCgiMode) {
 		// CGI mode
+        long time_id = std::chrono::duration_cast<std::chrono::nanoseconds>(std::chrono::high_resolution_clock::now().time_since_epoch()).count();
+		Log::setThreadRequestId(time_id); //time as request id, to differentiate the requests
+		Log::debug("New CGI request.");
 		HTTPService::run(std::cin.rdbuf(), std::cout.rdbuf(), std::cerr.rdbuf());
+        Log::debug("Finished Request.");
 	}
 	else {
 		// FCGI mode
@@ -129,4 +150,5 @@ int main() {
 			threads[i].join();
 		}
 	}
+	Log::fileOff();
 }

src/mapping_manager.cpp

@@ -791,6 +791,9 @@ int main(int argc, char *argv[]) {
 	NopCacheManager cm;
 	CacheManager::init(&cm);
 
+	if(Configuration::get<bool>("log.logtofile")){
+		Log::logToFile(false);
+	}
 	Log::logToStream(Log::LogLevel::WARN, &std::cerr);
 
 	const char *command = argv[1];

src/services/artifact.cpp

@@ -6,6 +6,7 @@
 #include "util/exceptions.h"
 #include "util/curl.h"
 #include "util/timeparser.h"
+#include "util/log.h"
 
 #include <cstring>
 #include <sstream>
@@ -62,6 +63,7 @@ void ArtifactService::run() {
 
 		auto session = UserDB::loadSession(params.get("sessiontoken"));
 		auto user = session->getUser();
+		Log::debug("User: " + user.getUserIDString());
 
 		if(request == "create") {
 			std::string type = params.get("type");

src/services/featurecollectiondb.cpp

@@ -1,10 +1,10 @@
 
 #include "datatypes/plot.h"
 #include "operators/operator.h"
-
 #include "services/ogcservice.h"
 #include "featurecollectiondb/featurecollectiondb.h"
 #include "util/enumconverter.h"
+#include "util/log.h"
 
 static const std::vector< std::pair<Query::ResultType, std::string> > featureTypeMap = {
 	std::make_pair(Query::ResultType::POINTS, "points"),
@@ -80,6 +80,7 @@ Json::Value FeatureCollectionDBService::metaDataToJson(const FeatureCollectionDB
 void FeatureCollectionDBService::run() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto& user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	if(!FeatureCollectionDB::isAvailable()){
 		throw SourceException("FeatureCollectionDB is not available.");

src/services/httpservice.cpp

@@ -46,6 +46,11 @@ void HTTPService::run(std::streambuf *in, std::streambuf *out, std::streambuf *e
 	std::ostream error(err);
 	HTTPResponseStream response(out);
 
+	//read query input to string and log it. reset input istream position to the beginning afterwards.
+	std::string query_string((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
+	input.seekg(0, std::ios_base::beg);
+	Log::debug(query_string);
+
 	Log::logToStream(Log::LogLevel::WARN, &error);
 	Log::logToMemory(Log::LogLevel::INFO);
 	try {
@@ -57,21 +62,24 @@ void HTTPService::run(std::streambuf *in, std::streambuf *out, std::streambuf *e
 		auto servicename = params.get("service");
 		auto service = HTTPService::getRegisteredService(servicename, params, response, error);
 
+		Log::debug("Running new service: " + servicename);
+
 		service->run();
 	}
     catch(const MappingException &e){
         catchExceptions(response, e);
     }
 	catch (const std::exception &e) {
 		error << "Request failed with an exception: " << e.what() << "\n";
+        Log::debug(e.what());
 		if (Configuration::get<bool>("global.debug", false)) {
             response.send500(concat("invalid request: ", e.what()));
         } else {
             response.send500("invalid request");
         }
 
 	}
-	Log::off();
+	Log::streamAndMemoryOff();
 }
 
 /**
@@ -82,6 +90,11 @@ void HTTPService::run(std::streambuf *in, std::streambuf *out, std::streambuf *e
 	std::ostream error(err);
 	HTTPResponseStream response(out);
 
+	//read query input to string and log it. reset input istream position to the beginning afterwards.
+	std::string query_string((std::istreambuf_iterator<char>(in)), std::istreambuf_iterator<char>());
+	input.seekg(0, std::ios_base::beg);
+	Log::debug(query_string);
+
 	Log::logToStream(Log::LogLevel::WARN, &error);
 	Log::logToMemory(Log::LogLevel::INFO);
 	try {
@@ -93,20 +106,23 @@ void HTTPService::run(std::streambuf *in, std::streambuf *out, std::streambuf *e
 		auto servicename = params.get("service");
 		auto service = HTTPService::getRegisteredService(servicename, params, response, error);
 
+		Log::debug("Running new service: " + servicename);
+
 		service->run();
 	}
     catch(const MappingException &e){
         catchExceptions(response, e);
     }
 	catch (const std::exception &e) {
 		error << "Request failed with an exception: " << e.what() << "\n";
+		Log::debug(e.what());
 		if (Configuration::get<bool>("global.debug", false)) {
             response.send500(concat("invalid request: ", e.what()));
         } else {
             response.send500("invalid request");
         }
 	}
-	Log::off();
+	Log::streamAndMemoryOff();
 }
 
 void HTTPService::catchExceptions(HTTPResponseStream& response, const MappingException &me){
@@ -126,6 +142,7 @@ void HTTPService::catchExceptions(HTTPResponseStream& response, const MappingExc
         }
         response.sendHeader("Status", "500 Internal Server Error");
         response.sendJSON(exceptionJson);
+        Log::debug(exceptionJson.asString());
     } else {
         response.send500("invalid request");
     }

src/services/plot.cpp

@@ -1,7 +1,7 @@
 
 #include "datatypes/plot.h"
 #include "operators/operator.h"
-
+#include "util/log.h"
 #include "services/ogcservice.h"
 
 /*
@@ -24,6 +24,7 @@ REGISTER_HTTP_SERVICE(PlotService, "plot");
 void PlotService::run() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	std::string queryString = params.get("query", "");
 	if(queryString == "")

src/services/provenance.cpp

@@ -1,6 +1,7 @@
 
 #include "services/ogcservice.h"
 #include "operators/operator.h"
+#include "util/log.h"
 
 /*
  * This class serves provenance information of a query.
@@ -27,6 +28,7 @@ REGISTER_HTTP_SERVICE(ProvenanceService, "provenance");
 void ProvenanceService::run() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	std::string type = params.get("type", "");
 	if(type != "points" && type != "lines" && type != "polygons" && type != "raster") {

src/services/user.cpp

@@ -9,6 +9,7 @@
 #include <util/gdal_source_datasets.h>
 #include <util/ogr_source_datasets.h>
 #include <boost/filesystem.hpp>
+#include <util/log.h>
 
 /**
  * This class provides user specific methods
@@ -47,6 +48,7 @@ void UserService::run() {
 		// anything except login is only allowed with a valid session, so check for it.
 		auto session = UserDB::loadSession(params.get("sessiontoken"));
 		auto user = session->getUser();
+		Log::debug("User: " + user.getUserIDString());
 
 		if (request == "logout") {
 			session->logout();

src/services/wcs.cpp

@@ -3,6 +3,7 @@
 #include "operators/operator.h"
 #include "datatypes/raster.h"
 #include "util/timeparser.h"
+#include "util/log.h"
 
 /**
  * Implementation of the OGC WCS standard http://www.opengeospatial.org/standards/wcs
@@ -81,6 +82,7 @@ static int getWcsParameterInteger(const std::string &wcsParameterString){
 void WCSService::run() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	/*http://www.myserver.org:port/path?
 	 * service=WCS &version=2.0

src/services/wfs.cpp

@@ -6,6 +6,7 @@
 #include "pointvisualization/CircleClusteringQuadTree.h"
 #include "util/timeparser.h"
 #include "util/enumconverter.h"
+#include "util/log.h"
 
 #include <string>
 #include <cmath>
@@ -90,6 +91,7 @@ void WFSService::getCapabilities() {
 void WFSService::getFeature() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	if(!params.hasParam("typenames"))
 		throw ArgumentException("WFSService: typeNames parameter not specified");

src/services/wms.cpp

@@ -27,6 +27,7 @@ REGISTER_HTTP_SERVICE(WMSService, "WMS");
 void WMSService::run() {
 	auto session = UserDB::loadSession(params.get("sessiontoken"));
 	auto user = session->getUser();
+	Log::debug("User: " + user.getUserIDString());
 
 	bool debug = params.getBool("debug", Configuration::get<bool>("global.debug", false));
 	auto query_crsId = parseCrsId(params, "crs");

src/uploader/uploader_cgi.cpp

@@ -7,7 +7,7 @@
 
 int main() {
     Configuration::loadFromDefaultPaths();
-    Log::off();
+    Log::streamAndMemoryOff();
     UserDB::initFromConfiguration();
 
     UploadService service(std::cin.rdbuf(), std::cout.rdbuf(), std::cerr.rdbuf());