diff options
author | randomdan <randomdan@localhost> | 2011-03-08 12:57:36 +0000 |
---|---|---|
committer | randomdan <randomdan@localhost> | 2011-03-08 12:57:36 +0000 |
commit | e1ffe0d64996af3110ea5b6c8b677682381d2ba9 (patch) | |
tree | a153976de624b099694618f0286a285613e14085 /project2/cgi | |
parent | Fix inheritance of If (diff) | |
download | project2-e1ffe0d64996af3110ea5b6c8b677682381d2ba9.tar.bz2 project2-e1ffe0d64996af3110ea5b6c8b677682381d2ba9.tar.xz project2-e1ffe0d64996af3110ea5b6c8b677682381d2ba9.zip |
Split appData and envData
Add appData to all presenters, add envData to the final cgi stage if it is a presenter
Add timing info to appData
Diffstat (limited to 'project2/cgi')
-rw-r--r-- | project2/cgi/cgiAppEngine.cpp | 26 | ||||
-rw-r--r-- | project2/cgi/cgiAppEngine.h | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/project2/cgi/cgiAppEngine.cpp b/project2/cgi/cgiAppEngine.cpp index d8c667a..e8c23e5 100644 --- a/project2/cgi/cgiAppEngine.cpp +++ b/project2/cgi/cgiAppEngine.cpp @@ -10,6 +10,7 @@ #include <boost/foreach.hpp> #include "../sessionXml.h" #include <cxxabi.h> +#include <boost/date_time/microsec_time_clock.hpp> const std::string SESSIONID = "sessionID"; typedef UUID SIDKey; @@ -108,6 +109,7 @@ CgiApplicationEngine::write(std::ostream & IO) const void CgiApplicationEngine::process() const { + startTime = boost::date_time::microsec_clock<boost::posix_time::ptime>::universal_time(); try { for (StagePtr nextStage; (nextStage = currentStage->run()); ) { currentStage = nextStage; @@ -119,6 +121,11 @@ CgiApplicationEngine::process() const catch (const std::exception & ex) { currentStage = new ErrorStage(_env, ex); } + endTime = boost::date_time::microsec_clock<boost::posix_time::ptime>::universal_time(); + const Presenter * p = boost::dynamic_pointer_cast<const Presenter>(currentStage).get(); + if (p) { + addAppData(p); + } } CgiApplicationEngine::Stage::Stage() @@ -165,8 +172,12 @@ CgiApplicationEngine::PresentStage::getDataDocument() const } void -CgiApplicationEngine::addAppData(const Presenter * p) const +CgiApplicationEngine::addEnvData(const Presenter * p) const { + // These were for debug... but why not pass them on? + p->addField("servername", "project2", env()->getServerName()); + p->addField("scriptname", "project2", env()->getScriptName()); + // URL elements p->pushSub("uriElems", "project2"); BOOST_FOREACH(std::string s, _env->elems) { @@ -183,7 +194,11 @@ CgiApplicationEngine::addAppData(const Presenter * p) const p->popSub(); } p->popSub(); +} +void +CgiApplicationEngine::addAppData(const Presenter * p) const +{ // Sessions variables if (!sessionID.is_nil()) { p->pushSub("session", "project2"); @@ -197,6 +212,15 @@ CgiApplicationEngine::addAppData(const Presenter * p) const } p->popSub(); } + + // Timing info + p->pushSub("timing", "project2"); + p->addAttr("start", startTime); + if (!endTime.is_not_a_date_time()) { + p->addAttr("end", endTime); + p->addAttr("duration", (endTime - startTime).total_milliseconds()); + } + p->popSub(); } CgiApplicationEngine::RequestStage::RequestStage(const std::string & id) diff --git a/project2/cgi/cgiAppEngine.h b/project2/cgi/cgiAppEngine.h index 65142b6..cfab7c4 100644 --- a/project2/cgi/cgiAppEngine.h +++ b/project2/cgi/cgiAppEngine.h @@ -33,9 +33,12 @@ class CgiApplicationEngine : public ApplicationEngine { SessionPtr session() const; virtual Glib::ustring resolveCurrentConfig() const; void addAppData(const Presenter * p) const; + void addEnvData(const Presenter * p) const; const CgiEnvironment * _env; private: + mutable boost::posix_time::ptime startTime; + mutable boost::posix_time::ptime endTime; typedef std::pair<Glib::ustring, Glib::ustring> DomainPlatform; typedef std::list<DomainPlatform> DomainPlatforms; mutable DomainPlatforms domplat; |