coreLog instrumentation.

10 files changed, 40 insertions, 2 deletions

diff --git a/framework/Web/Services/TPageService.php b/framework/Web/Services/TPageService.php
index 5723269f..8f12c650 100644
--- a/framework/Web/Services/TPageService.php
+++ b/framework/Web/Services/TPageService.php
@@ -146,6 +146,7 @@ class TPageService extends TService
 	 */

 	public function init($config)

 	{

+		Prado::coreLog("Initializing TPageService");

 		$application=$this->getApplication();

 

 		$application->setPageService($this);

@@ -250,6 +251,7 @@ class TPageService extends TService
 		// load modules specified in page directory config

 		foreach($pageConfig->getModules() as $id=>$moduleConfig)

 		{

+			Prado::coreLog("Loading module $id");

 			$module=Prado::createComponent($moduleConfig[0]);

 			$application->setModule($id,$module);

 			foreach($moduleConfig[1] as $name=>$value)

@@ -425,6 +427,7 @@ class TPageService extends TService
 	 */

 	public function run()

 	{

+		Prado::coreLog("Running page service");

 		$page=null;

 		$path=$this->_basePath.'/'.strtr($this->_pagePath,'.','/');

 		if(is_file($path.self::PAGE_FILE_EXT))

@@ -611,6 +614,7 @@ class TPageConfiguration extends TComponent
 	 */

 	private function loadFromFile($fname,$page)

 	{

+		Prado::coreLog("Loading $page with file $fname");

 		if(empty($fname) || !is_file($fname))

 			return;

 		$dom=new TXmlDocument;

diff --git a/framework/Web/THttpRequest.php b/framework/Web/THttpRequest.php
index c3c9e33d..bb2eb7b4 100644
--- a/framework/Web/THttpRequest.php
+++ b/framework/Web/THttpRequest.php
@@ -373,6 +373,7 @@ class THttpRequest extends TModule
 				break;

 			}

 		}

+		Prado::coreLog("Resolving request {$this->_serviceID}={$this->_serviceParam}");

 	}

 

 	/**

diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php
index ba2f607c..ecaf59d0 100644
--- a/framework/Web/THttpResponse.php
+++ b/framework/Web/THttpResponse.php
@@ -232,6 +232,7 @@ class THttpResponse extends TModule implements ITextWriter
 	{

 		if($this->_bufferOutput)

 			ob_flush();

+		Prado::coreLog("Flushing output");

 	}

 

 	/**

@@ -241,6 +242,7 @@ class THttpResponse extends TModule implements ITextWriter
 	{

 		if($this->_bufferOutput)

 			ob_clean();

+		Prado::coreLog("Clearing output");

 	}

 

 	/**

diff --git a/framework/Web/UI/TAssetManager.php b/framework/Web/UI/TAssetManager.php
index 0cce2c27..1ff0f47a 100644
--- a/framework/Web/UI/TAssetManager.php
+++ b/framework/Web/UI/TAssetManager.php
@@ -141,6 +141,7 @@ class TAssetManager extends TModule
 	 */

 	public function publishFilePath($path,$checkTimestamp=false)

 	{

+		Prado::coreLog("Publishing file $path");

 		if(isset($this->_published[$path]))

 			return $this->_published[$path];

 		else if(($fullpath=realpath($path))===false)

diff --git a/framework/Web/UI/TControl.php b/framework/Web/UI/TControl.php
index 34e9b92f..3ba79478 100644
--- a/framework/Web/UI/TControl.php
+++ b/framework/Web/UI/TControl.php
@@ -683,8 +683,11 @@ class TControl extends TComponent
 	 */

 	public function dataBind()

 	{

+		Prado::coreLog("Data bind properties");

 		$this->dataBindProperties();

+		Prado::coreLog("onDataBinding()");

 		$this->onDataBinding(null);

+		Prado::coreLog("dataBindChildren()");

 		$this->dataBindChildren();

 	}

 

diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php
index 4cb97911..28c6c3aa 100644
--- a/framework/Web/UI/TForm.php
+++ b/framework/Web/UI/TForm.php
@@ -53,6 +53,7 @@ class TForm extends TControl
 	 */

 	protected function render($writer)

 	{

+		Prado::coreLog("Rendering form ".$this->getName());

 		$this->addAttributesToRender($writer);

 		$writer->renderBeginTag('form');

 		$page=$this->getPage();

diff --git a/framework/Web/UI/TPage.php b/framework/Web/UI/TPage.php
index 624ed550..2269079b 100644
--- a/framework/Web/UI/TPage.php
+++ b/framework/Web/UI/TPage.php
@@ -133,38 +133,59 @@ class TPage extends TTemplateControl
 	 */

 	public function run($writer)

 	{

+		Prado::coreLog("Running page life cycles");

 		$this->determinePostBackMode();

-

+		

+		Prado::coreLog("Page onPreInit()");

 		$this->onPreInit(null);

+		Prado::coreLog("Page initRecursive()");

 		$this->initRecursive();

+		Prado::coreLog("Page onInitComplete()");

 		$this->onInitComplete(null);

 

 		if($this->getIsPostBack())

 		{

 			$this->_restPostData=new TMap;

+			Prado::coreLog("Page loadPageState()");

 			$this->loadPageState();

+			Prado::coreLog("Page processPostData()");

 			$this->processPostData($this->_postData,true);

+			Prado::coreLog("Page onPreLoad()");

 			$this->onPreLoad(null);

+			Prado::coreLog("Page loadRecursive()");

 			$this->loadRecursive();

+			Prado::coreLog("Page processPostData()");

 			$this->processPostData($this->_restPostData,false);

+			Prado::coreLog("Page raiseChangedEvents()");

 			$this->raiseChangedEvents();

+			Prado::coreLog("Page raisePostBackEvent()");

 			$this->raisePostBackEvent();

+			Prado::coreLog("Page onLoadComplete()");

 			$this->onLoadComplete(null);

 		}

 		else

 		{

+			Prado::coreLog("Page onPreLoad()");

 			$this->onPreLoad(null);

+			Prado::coreLog("Page loadRecursive()");

 			$this->loadRecursive();

+			Prado::coreLog("Page onLoadComplete()");

 			$this->onLoadComplete(null);

 		}

 

+		Prado::coreLog("Page preRenderRecursive()");

 		$this->preRenderRecursive();

+		Prado::coreLog("Page onPreRenderComplete()");

 		$this->onPreRenderComplete(null);

 

+		Prado::coreLog("Page savePageState()");

 		$this->savePageState();

+		Prado::coreLog("Page onSaveStateComplete()");

 		$this->onSaveStateComplete(null);

 

+		Prado::coreLog("Page renderControl()");

 		$this->renderControl($writer);

+		Prado::coreLog("Page unloadRecursive()");

 		$this->unloadRecursive();

 	}

 

@@ -263,6 +284,7 @@ class TPage extends TTemplateControl
 		$this->_validated=true;

 		if($this->_validators && $this->_validators->getCount())

 		{

+			Prado::coreLog("Page validate");

 			if($validationGroup==='')

 			{

 				foreach($this->_validators as $validator)

diff --git a/framework/Web/UI/TPageStatePersister.php b/framework/Web/UI/TPageStatePersister.php
index d312ed84..2711041a 100644
--- a/framework/Web/UI/TPageStatePersister.php
+++ b/framework/Web/UI/TPageStatePersister.php
@@ -52,6 +52,7 @@ class TPageStatePersister extends TModule implements IStatePersister
 	 */

 	public function save($state)

 	{

+		Prado::coreLog("Saving state");

 		$data=Prado::serialize($state);

 		$hmac=$this->computeHMAC($data,$this->getPrivateKey());

 		if(extension_loaded('zlib'))

@@ -68,6 +69,7 @@ class TPageStatePersister extends TModule implements IStatePersister
 	 */

 	public function load()

 	{

+		Prado::coreLog("Loading state");

 		$str=base64_decode($this->getApplication()->getRequest()->getItems()->itemAt(TPage::FIELD_PAGESTATE));

 		if($str==='')

 			return null;

diff --git a/framework/Web/UI/TTemplateControl.php b/framework/Web/UI/TTemplateControl.php
index 9987bc9c..a25a2e41 100644
--- a/framework/Web/UI/TTemplateControl.php
+++ b/framework/Web/UI/TTemplateControl.php
@@ -101,8 +101,9 @@ class TTemplateControl extends TControl implements INamingContainer
 	 */

 	protected function loadTemplate()

 	{

+		Prado::coreLog("Loading template ".get_class($this));

 		$template=$this->getService()->getTemplateManager()->getTemplateByClassName(get_class($this));

-		self::$_template[get_class($this)]=$template;

+		self::$_template[get_class($this)]=$template;		

 		return $template;

 	}

 

diff --git a/framework/Web/UI/TThemeManager.php b/framework/Web/UI/TThemeManager.php
index bbcd35a6..73745254 100644
--- a/framework/Web/UI/TThemeManager.php
+++ b/framework/Web/UI/TThemeManager.php
@@ -313,6 +313,7 @@ class TTheme extends TComponent
 		{

 			foreach($this->_skins[$type][$id] as $name=>$value)

 			{

+				Prado::coreLog("Applying skin $name to $type");

 				if(is_array($value))

 				{

 					if($value[0]===TTemplate::CONFIG_EXPRESSION)