- Fixed control-c bug #518, #523

gizmocuz · gizmocuz · commit 4bbd827a9793 · 2016-02-28T09:50:40.000+01:00
- Added www debug logging via preprocessor DEBUG_WWW - Changed: Custom Templates, now possible to have a space in the html file (My Custom Page) - Implemented: Custom Templates, now possible to directly call custom template pages (http://127.0.0.1:8080/#/Custom/mypage)
diff --git a/History.txt b/History.txt
@@ -3,6 +3,7 @@ Version 2.4xxx
 - Implemented: Blockly, now possible to send a notification with a user variable/device as subject/body
 - Implemented: Chinese language support, big thanks to wxws!!
 - Implemented: CounterType 'Time'
+- Implemented: Custom Templates, now possible to directly call custom template pages (http://127.0.0.1:8080/#/Custom/mypage)
 - Implemented: Day display in energy/gas/water/temp report
 - Implemented: Dummy Hardware, Option to supply name, sensor is now also directly added to the system
 - Implemented: Dummy Hardware, Wind+Temp+Chill
diff --git a/webserver/cWebem.cpp b/webserver/cWebem.cpp
@@ -952,7 +952,7 @@ int cWebem::CountSessions() {
 }
 
 void cWebem::CleanSessions() {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] cleaning sessions...", GetPort().c_str());
 #endif
 	int before = CountSessions();
@@ -1241,7 +1241,7 @@ std::string cWebemRequestHandler::generateSessionID()
 
 	std::string sessionId = GenerateMD5Hash(base64_encode((const unsigned char*)randomValue.c_str(), randomValue.size()));
 
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] generate new session id token %s", myWebem->GetPort().c_str(), sessionId.c_str());
 #endif
 
@@ -1261,7 +1261,7 @@ std::string cWebemRequestHandler::generateAuthToken(const WebEmSession & session
 
 	std::string authToken = base64_encode((const unsigned char*)randomValue.c_str(), randomValue.size());
 
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] generate new authentication token %s", myWebem->GetPort().c_str(), authToken.c_str());
 #endif
 
@@ -1508,8 +1508,8 @@ bool cWebemRequestHandler::checkAuthToken(WebEmSession & session) {
 		return false;
 	}
 
-#ifdef _DEBUG
-	// _log.Log(LOG_STATUS, "[web:%s] CheckAuthToken(%s_%s_%s) : user authenticated", myWebem->GetPort().c_str(), session.id.c_str(), session.auth_token.c_str(), session.username.c_str());
+#ifdef DEBUG_WWW
+	_log.Log(LOG_STATUS, "[web:%s] CheckAuthToken(%s_%s_%s) : user authenticated", myWebem->GetPort().c_str(), session.id.c_str(), session.auth_token.c_str(), session.username.c_str());
 #endif
 
 	if (session.username.empty()) {
@@ -1531,7 +1531,7 @@ bool cWebemRequestHandler::checkAuthToken(WebEmSession & session) {
 		sessionExpires = session.expires < now;
 
 		if (!userExists || sessionExpires) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 			_log.Log(LOG_ERROR, "[web:%s] CheckAuthToken(%s_%s) : cannot restore session, user not found or session expired", myWebem->GetPort().c_str(), session.id.c_str(), session.auth_token.c_str());
 #endif
 			removeAuthToken(session.id);
@@ -1540,7 +1540,7 @@ bool cWebemRequestHandler::checkAuthToken(WebEmSession & session) {
 
 		WebEmSession* oldSession = myWebem->GetSession(session.id);
 		if (oldSession == NULL) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 			_log.Log(LOG_STATUS, "[web:%s] CheckAuthToken(%s_%s_%s) : restore session", myWebem->GetPort().c_str(), session.id.c_str(), session.auth_token.c_str(), session.username.c_str());
 #endif
 			myWebem->AddSession(session);
@@ -1633,7 +1633,7 @@ void cWebemRequestHandler::handle_request(const request& req, reply& rep)
 				// Find and include any special cWebem strings
 				if (!myWebem->Include(rep.content)) {
 					if (mInfo.mtime_support && !mInfo.is_modified) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 						_log.Log(LOG_STATUS, "[web:%s] %s not modified (1).", myWebem->GetPort().c_str(), req.uri.c_str());
 #endif
 						rep = reply::stock_reply(reply::not_modified);
@@ -1658,7 +1658,7 @@ void cWebemRequestHandler::handle_request(const request& req, reply& rep)
 		{
 			if (mInfo.mtime_support && !mInfo.is_modified) {
 				rep = reply::stock_reply(reply::not_modified);
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 				_log.Log(LOG_STATUS, "[web:%s] %s not modified (2).", myWebem->GetPort().c_str(), req.uri.c_str());
 #endif
 				return;
@@ -1670,7 +1670,7 @@ void cWebemRequestHandler::handle_request(const request& req, reply& rep)
 		else {
 			if (mInfo.mtime_support && !mInfo.is_modified) {
 				rep = reply::stock_reply(reply::not_modified);
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 				_log.Log(LOG_STATUS, "[web:%s] %s not modified (3).", myWebem->GetPort().c_str(), req.uri.c_str());
 #endif
 				return;
@@ -1701,7 +1701,9 @@ void cWebemRequestHandler::handle_request(const request& req, reply& rep)
 		send_cookie(rep, session);
 
 	} else if (session.forcelogin == true) {
+#ifdef DEBUG_WWW
 		_log.Log(LOG_STATUS, "[web:%s] Logout : remove session %s", myWebem->GetPort().c_str(), session.id.c_str());
+#endif
 		myWebem->RemoveSession(session.id);
 		removeAuthToken(session.id);
 		if (myWebem->m_authmethod == AUTH_BASIC) {
diff --git a/webserver/connection.cpp b/webserver/connection.cpp
@@ -29,10 +29,11 @@ connection::connection(boost::asio::io_service& io_service,
 				request_handler_(handler),
 				read_timeout_(read_timeout),
 				read_timer_(io_service, boost::posix_time::seconds(read_timeout)),
-				default_abandoned_timeout_(20*60), // 20mn before stopping abandoned connection
+				default_abandoned_timeout_(20*60), // close abandoned connections after 20 minutes
 				abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_)),
 				status("initializing"),
-				stop_required(false)
+				stop_required(false),
+				reply_(reply::stock_reply(reply::internal_server_error))
 {
 	secure_ = false;
 	keepalive_ = false;
@@ -53,10 +54,11 @@ connection::connection(boost::asio::io_service& io_service,
 				request_handler_(handler),
 				read_timeout_(read_timeout),
 				read_timer_(io_service, boost::posix_time::seconds(read_timeout)),
-				default_abandoned_timeout_(20*60), // 20mn before stopping abandoned connection
+				default_abandoned_timeout_(20*60), // close abandoned connections after 20 minutes
 				abandoned_timer_(io_service, boost::posix_time::seconds(default_abandoned_timeout_)),
 				status("initializing"),
-				stop_required(false)
+				stop_required(false),
+				reply_(reply::stock_reply(reply::internal_server_error))
 {
 	secure_ = true;
 	keepalive_ = false;
@@ -320,7 +322,7 @@ void connection::reset_read_timeout() {
 /// stop connection on read timeout
 void connection::handle_read_timeout(const boost::system::error_code& error) {
 	if (error != boost::asio::error::operation_aborted) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 		_log.Log(LOG_STATUS, "%s -> handle read timeout", host_endpoint_.c_str());
 #endif
 		connection_manager_.stop(shared_from_this());
diff --git a/webserver/connection_manager.cpp b/webserver/connection_manager.cpp
@@ -53,9 +53,9 @@ void connection_manager::stop(connection_ptr c)
 	c->stop();
 }
 
-void connection_manager::stop_all(bool graceful_stop)
+void connection_manager::stop_all(const bool graceful_stop)
 {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS,"%stopping connections...", graceful_stop ? "Gracefully s" : "S");
 #endif
 	if (graceful_stop) {
@@ -64,17 +64,17 @@ void connection_manager::stop_all(bool graceful_stop)
 		int timeout = 10; // force stop after 10 seconds
 		time_t start = mytime(NULL);
 		while(true) {
-			if (connections_.size() < 1) {
+			if (connections_.empty()) {
 				break;
 			}
 			if ((mytime(NULL) - start) > timeout) {
 				// timeout occurred : force stop
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 				_log.Log(LOG_STATUS,"Graceful stop timeout occurred : remaining connections will be closed now");
 #endif
 				break;
 			}
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 			_log.Log(LOG_STATUS,"Graceful stopping : %d active connection(s)", (int) connections_.size());
 #endif
 			sleep_milliseconds(500);
diff --git a/webserver/connection_manager.hpp b/webserver/connection_manager.hpp
@@ -25,13 +25,13 @@ class connection_manager
 {
 public:
   /// Add the specified connection to the manager and start it.
-  void start(connection_ptr c);
+  void start(const connection_ptr c);
 
   /// Stop the specified connection.
-  void stop(connection_ptr c);
+  void stop(const connection_ptr c);
 
   /// Stop all connections.
-  void stop_all(bool graceful_stop);
+  void stop_all(const bool graceful_stop);
 
 private:
   /// The managed connections.
diff --git a/webserver/server.cpp b/webserver/server.cpp
@@ -62,7 +62,7 @@ void server_base::run() {
 		is_running = false;
 		handle_stop(); // dispatch or post call does NOT work because it is pushed in the event queue (executed only on next io service run)
 		io_service_.reset(); // this call is needed before calling run() again
-		throw e;
+		throw;
 	} catch (...) {
 		_log.Log(LOG_ERROR, "[web:%s] unknown exception occurred (need to run again)", settings_.listening_port.c_str());
 		is_running = false;
@@ -83,22 +83,19 @@ bool server_base::stopped() {
 }
 
 void server_base::handle_stop() {
-	// The server is stopped by cancelling all outstanding asynchronous
-	// operations. Once all operations have finished the io_service::run() call
-	// will exit.
 	is_stopping = true;
-	connection_manager_.stop_all(true);
 	try {
 		boost::system::error_code ignored_ec;
 		acceptor_.close(ignored_ec);
 	} catch (...) {
 		_log.Log(LOG_ERROR, "[web:%s] exception occurred while closing acceptor", settings_.listening_port.c_str());
 	}
+	connection_manager_.stop_all(false);
 }
 
 server::server(const server_settings & settings, request_handler & user_request_handler) :
 		server_base(settings, user_request_handler) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] create server using settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
 #endif
 	init(boost::bind(&server::init_connection, this),
@@ -133,7 +130,7 @@ ssl_server::ssl_server(const ssl_server_settings & ssl_settings, request_handler
 		settings_(ssl_settings),
 		context_(io_service_, ssl_settings.get_ssl_method())
 {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using ssl_server_settings : %s", ssl_settings.listening_port.c_str(), ssl_settings.to_string().c_str());
 #endif
 	init(boost::bind(&ssl_server::init_connection, this),
@@ -145,7 +142,7 @@ ssl_server::ssl_server(const server_settings & settings, request_handler & user_
 		server_base(settings, user_request_handler),
 		settings_(dynamic_cast<ssl_server_settings const &>(settings)),
 		context_(io_service_, dynamic_cast<ssl_server_settings const &>(settings).get_ssl_method()) {
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 	_log.Log(LOG_STATUS, "[web:%s] create ssl_server using server_settings : %s", settings.listening_port.c_str(), settings.to_string().c_str());
 #endif
 	init(boost::bind(&ssl_server::init_connection, this),
@@ -206,7 +203,7 @@ void ssl_server::init_connection() {
 				(std::istreambuf_iterator<char>()));
 		if (content.find("BEGIN DH PARAMETERS") != std::string::npos) {
 			context_.use_tmp_dh_file(settings_.tmp_dh_file_path);
-#ifdef _DEBUG
+#ifdef DEBUG_WWW
 			_log.Log(LOG_STATUS, "[web:%s] 'BEGIN DH PARAMETERS' found in file %s", settings_.listening_port.c_str(), settings_.tmp_dh_file_path.c_str());
 #endif
 		} else {
diff --git a/www/app/CustomController.js b/www/app/CustomController.js
@@ -0,0 +1,16 @@
+define(['app'], function (app) {
+	app.controller('CustomController', [ '$scope', '$rootScope', '$location', '$http', '$interval', '$routeParams', function($scope,$rootScope,$location,$http,$interval,$routeParams) {
+		init();
+
+		function init()
+		{
+			var custompage=$routeParams.custompage.replace(/ /g,"%20");
+			$("#customcontent").load("templates/" + custompage + ".html", function (response, status, xhr) {
+				if (status == "error") {
+					var msg = "Sorry but there was an error: ";
+					$("#customcontent").html(msg + xhr.status + " " + xhr.statusText);
+				}
+			});		
+		};
+	} ]);
+});
diff --git a/www/app/app.js b/www/app/app.js
@@ -315,6 +315,11 @@ define(['angularAMD', 'angular-route', 'angular-animate', 'ng-grid', 'ng-grid-fl
 				templateUrl: 'views/about.html',
 				controller: 'AboutController'
 			  })).
+			  when('/Custom/:custompage', angularAMD.route({
+					templateUrl: 'views/custom.html',
+					controller: 'CustomController'
+				})
+			  ).
 			  otherwise({
 				redirectTo: '/Dashboard'
 			  });
diff --git a/www/html5.appcache b/www/html5.appcache
@@ -442,6 +442,7 @@ i18n/domoticz-zh.json
 app/AboutController.js
 app/app.js
 app/CamController.js
+app/CustomController.js
 app/CustomIconsController.js
 app/DashboardController.js
 app/DevicesController.js
@@ -542,6 +543,7 @@ ozwcp/cp.js
 # HTML pages
 views/about.html
 views/cam.html
+views/custom.html
 views/customicons.html
 views/dashboard.html
 views/devices.html
diff --git a/www/js/domoticz.js.gz b/www/js/domoticz.js.gz
diff --git a/www/templates/custom.example b/www/templates/custom.example
@@ -1,5 +1,9 @@
 <link href="http://fonts.googleapis.com/css?family=Orbitron:700" rel="stylesheet" type="text/css">
 <style>
+body {
+	background: #000;
+}
+
 div#cnt {
 	background: #FF00FF;
 	width: 990px;
diff --git a/www/views/custom.html b/www/views/custom.html
@@ -0,0 +1,2 @@
+<div id="customcontent">
+</div>
