- Added basic logging to CppCMS

artyom-beilis · artyom-beilis · commit b31ea1e212ee · 2010-05-17T14:43:24.000Z
- Added std::cerr logger by-default
diff --git a/booster/lib/log/src/log.cpp b/booster/lib/log/src/log.cpp
@@ -97,7 +97,12 @@ namespace log {
 
 	namespace {
 		// make sure it is created
-		struct init { init() { logger::instance(); } } the_init;
+		struct init { 
+			init() 
+			{
+				logger::instance().add_sink(shared_ptr<sink>(new sinks::standard_error()));
+			} 
+		} the_init;
 	}
 
 	struct logger::data {
diff --git a/src/cgi_api.cpp b/src/cgi_api.cpp
@@ -36,6 +36,8 @@
     namespace boost = cppcms_boost;
 #endif
 
+#include <booster/log.h>
+
 
 namespace cppcms { namespace impl { namespace cgi {
 /*
@@ -301,6 +303,8 @@ void connection::load_content(booster::system::error_code const &e,http::request
 		long long allowed=service().settings().get("security.multipart_form_data_limit",64*1024)*1024;
 		if(content_length > allowed) { 
 			set_error(h,"security violation: multipart/form-data content length too big");
+			BOOSTER_NOTICE("cppcms") << "multipart/form-data size too big " << content_length << 
+				" REMOTE_ADDR = `" << getenv("REMOTE_ADDR") << "' REMOTE_HOST=`" << getenv("REMOTE_HOST") << "'";
 			return;
 		}
 		// FIXME
@@ -310,7 +314,8 @@ void connection::load_content(booster::system::error_code const &e,http::request
 	long long allowed=service().settings().get("security.content_length_limit",1024)*1024;
 	if(content_length > allowed) {
 		set_error(h,"security violation POST content length too big");
-		// TODO log
+		BOOSTER_NOTICE("cppcms") << "POST data size too big " << content_length << 
+			" REMOTE_ADDR = `" << getenv("REMOTE_ADDR") << "' REMOTE_HOST=`" << getenv("REMOTE_HOST") << "'";
 		return;
 	}
 
diff --git a/src/fastcgi_api.cpp b/src/fastcgi_api.cpp
@@ -554,7 +554,6 @@ namespace cgi {
 		{
 			if(e) { h(e); return; }
 			if(header_.type!=fcgi_stdin || header_.content_length!=0) {
-				std::cerr<<int(header_.type) <<" "<<header_.content_length<<std::endl;
 				h(booster::system::error_code(errc::protocol_violation,cppcms_category));
 				return;				
 			}
diff --git a/src/http_context.cpp b/src/http_context.cpp
@@ -29,6 +29,7 @@
 #include <cppcms/cache_interface.h>
 #include <cppcms/session_interface.h>
 #include <cppcms/cppcms_error.h>
+#include <booster/log.h>
 
 #include <cppcms/config.h>
 #ifdef CPPCMS_USE_EXTERNAL_BOOST
@@ -127,8 +128,7 @@ void context::dispatch(booster::intrusive_ptr<application> app,std::string url,b
 			app->response().make_error_response(http::response::internal_server_error,e.what());
 		}
 		else {
-			// TODO log it
-			std::cerr<<"Catched excepion ["<<e.what()<<"]"<<std::endl;
+			BOOSTER_ERROR("cppcms") << "Catched excepion ["<<e.what()<<"]";
 		}
 	}
 }
diff --git a/src/service.cpp b/src/service.cpp
@@ -56,6 +56,7 @@
 #include <cppcms/views_pool.h>
 #include <cppcms/session_pool.h>
 
+#include <booster/log.h>
 
 #ifdef CPPCMS_POSIX
 #include <sys/wait.h>
@@ -422,20 +423,20 @@ bool service::prefork()
 					// TODO: Make better error handling
 					if(!WIFEXITED(status) || WEXITSTATUS(status)!=0){
 						if(WIFEXITED(status)) {
-							std::cerr<<"Chaild exited with "<<WEXITSTATUS(status)<<std::endl;
+							BOOSTER_CRITICAL("cppcms") <<"Chaild exited with "<<WEXITSTATUS(status);
 						}
 						else if(WIFSIGNALED(status)) {
-							std::cerr<<"Chaild killed by "<<WTERMSIG(status)<<std::endl;
+							BOOSTER_CRITICAL("cppcms") <<"Chaild killed by "<<WTERMSIG(status);
 						}
 						else {
-							std::cerr<<"Chaild exited for unknown reason"<<std::endl;
+							BOOSTER_CRITICAL("cppcms") <<"Chaild exited for unknown reason";
 						}
 						impl_->id_ = p - pids.begin() + 1;
 						*p=-1;
 						pid = ::fork();
 						if(pid < 0) {
 							int err=errno;
-							std::cerr<<"Failed to create process: " <<strerror(err)<<std::endl;
+							BOOSTER_ALERT("cppcms") <<"Failed to create process: " <<strerror(err);
 						}
 						else if(pid == 0) {
 							::sigaction(SIGCHLD,&sa_old,NULL);
diff --git a/src/tcp_cache_server.cpp b/src/tcp_cache_server.cpp
@@ -43,6 +43,7 @@
 #include <booster/aio/io_service.h>
 #include <booster/aio/endpoint.h>
 #include <booster/aio/buffer.h>
+#include <booster/log.h>
 #include <time.h>
 #include <stdlib.h>
 
@@ -351,16 +352,16 @@ static void thread_function(io::io_service *io)
 				// Not much to do...
 				// Object will be destroyed automatically 
 				// Because it does not resubmit itself
-				std::cerr <<"CppCMS Error "<<e.what()<<std::endl;
+				BOOSTER_ERROR("cache_server") <<"CppCMS Error "<<e.what();
 			}
 		}
 	}
 	catch(std::exception const &e)
 	{
-		std::cerr << "Fatal" << e.what() << std::endl;
+		BOOSTER_ERROR("cache_server") << "Fatal" << e.what();
 	}
 	catch(...){
-		std::cerr << "Unknown exception" << std::endl;
+		BOOSTER_ERROR("cache_server") << "Unknown exception" << std::endl;
 	}
 	io->stop();
 }

Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,6 @@ namespace cgi {`
`554`	`554`	`{`
`555`	`555`	`if(e) { h(e); return; }`
`556`	`556`	`if(header_.type!=fcgi_stdin \|\| header_.content_length!=0) {`
`557`		`- std::cerr<<int(header_.type) <<" "<<header_.content_length<<std::endl;`
`558`	`557`	`h(booster::system::error_code(errc::protocol_violation,cppcms_category));`
`559`	`558`	`return;`
`560`	`559`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include <cppcms/cache_interface.h>`
`30`	`30`	`#include <cppcms/session_interface.h>`
`31`	`31`	`#include <cppcms/cppcms_error.h>`
	`32`	`+#include <booster/log.h>`
`32`	`33`
`33`	`34`	`#include <cppcms/config.h>`
`34`	`35`	`#ifdef CPPCMS_USE_EXTERNAL_BOOST`
`@@ -127,8 +128,7 @@ void context::dispatch(booster::intrusive_ptr<application> app,std::string url,b`
`127`	`128`	`app->response().make_error_response(http::response::internal_server_error,e.what());`
`128`	`129`	`}`
`129`	`130`	`else {`
`130`		`- // TODO log it`
`131`		`- std::cerr<<"Catched excepion ["<<e.what()<<"]"<<std::endl;`
	`131`	`+ BOOSTER_ERROR("cppcms") << "Catched excepion ["<<e.what()<<"]";`
`132`	`132`	`}`
`133`	`133`	`}`
`134`	`134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@`
`43`	`43`	`#include <booster/aio/io_service.h>`
`44`	`44`	`#include <booster/aio/endpoint.h>`
`45`	`45`	`#include <booster/aio/buffer.h>`
	`46`	`+#include <booster/log.h>`
`46`	`47`	`#include <time.h>`
`47`	`48`	`#include <stdlib.h>`
`48`	`49`
`@@ -351,16 +352,16 @@ static void thread_function(io::io_service *io)`
`351`	`352`	`// Not much to do...`
`352`	`353`	`// Object will be destroyed automatically`
`353`	`354`	`// Because it does not resubmit itself`
`354`		`- std::cerr <<"CppCMS Error "<<e.what()<<std::endl;`
	`355`	`+ BOOSTER_ERROR("cache_server") <<"CppCMS Error "<<e.what();`
`355`	`356`	`}`
`356`	`357`	`}`
`357`	`358`	`}`
`358`	`359`	`catch(std::exception const &e)`
`359`	`360`	`{`
`360`		`- std::cerr << "Fatal" << e.what() << std::endl;`
	`361`	`+ BOOSTER_ERROR("cache_server") << "Fatal" << e.what();`
`361`	`362`	`}`
`362`	`363`	`catch(...){`
`363`		`- std::cerr << "Unknown exception" << std::endl;`
	`364`	`+ BOOSTER_ERROR("cache_server") << "Unknown exception" << std::endl;`
`364`	`365`	`}`
`365`	`366`	`io->stop();`
`366`	`367`	`}`