Allow all plugable components to have settings injected into them

Add settings to SendMailTask and SessionXML

3 files changed, 9 insertions, 7 deletions

diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp
index d601670..2d20614 100644
--- a/project2/cgi/cgiAppEngine.cpp
+++ b/project2/cgi/cgiAppEngine.cpp
@@ -90,7 +90,7 @@ CgiApplicationEngine::process() const
 	HttpHeaderPtr header = rs->getHeader();
 	if (!sessionID.is_nil()) {
 		header->setCookie(cgicc::HTTPCookie(SESSIONID, sessionID.str(), "Session ID",
-					_env->getServerName().substr(_env->getServerName().find(".")), 3600, "/", false));
+					_env->getServerName().substr(_env->getServerName().find(".")), env()->sessionTimeOut, "/", false));
 	}
 	header->render(IO);
 	if (currentStage.get<2>()) {
diff --git a/project2/cgi/p2webCgi.cpp b/project2/cgi/p2webCgi.cpp
index f10573f..6168819 100644
--- a/project2/cgi/p2webCgi.cpp
+++ b/project2/cgi/p2webCgi.cpp
@@ -1,12 +1,13 @@
 #include "cgiCommon.h"
 #include "../xmlObjectLoader.h"
+#include <boost/bind.hpp>
 
 int
 main(void)
 {
 	cgiServe(NULL, std::cout);
-	LoaderBase::onIteration();
-	LoaderBase::onPeriodic();
-	LoaderBase::onIdle();
+	LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onIteration, _1));
+	LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onPeriodic, _1));
+	LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onIdle, _1));
 }
 
diff --git a/project2/cgi/p2webFCgi.cpp b/project2/cgi/p2webFCgi.cpp
index d1aa29e..9a47b24 100644
--- a/project2/cgi/p2webFCgi.cpp
+++ b/project2/cgi/p2webFCgi.cpp
@@ -1,6 +1,7 @@
 #include "cgiCommon.h"
 #include "FCgiIO.h"
 #include "../xmlObjectLoader.h"
+#include <boost/bind.hpp>
 
 time_t lastPeriodic = 0;
 time_t periodicDelay = 600;
@@ -10,7 +11,7 @@ void
 p2webPeriodic()
 {
 	time(&lastPeriodic);
-	LoaderBase::onPeriodic();
+	LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onPeriodic, _1));
 }
 
 static
@@ -20,7 +21,7 @@ p2webGoingIdle(int)
 	if (time(NULL) > lastPeriodic + periodicDelay) {
 		p2webPeriodic();
 	}
-	LoaderBase::onIdle();
+	LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onIdle, _1));
 }
 
 int
@@ -44,7 +45,7 @@ main(void)
 			cgicc::FCgiIO IO(request);
 			cgiServe(&IO, IO);
 			alarm(60);
-			LoaderBase::onIteration();
+			LoaderBase::onAllComponents(boost::bind(&ComponentLoader::onIteration, _1));
 			if (time(NULL) > lastPeriodic + periodicDelay) {
 				p2webPeriodic();
 			}