Author: ornicar2
Date: 2010-02-11 18:42:08 +0100 (Thu, 11 Feb 2010)
New Revision: 27911
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/log/dmFileLog.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/log/request/dmRequestLog.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
Log:
[Diem]
- added "enabled" option to event_log and request_log services
- disabled log services when request has a "dm_nolog" parameter
- removed useless code in dmBaseLinkTag
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-02-11 17:26:44 UTC (rev 27910)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/services.yml
2010-02-11 17:42:08 UTC (rev 27911)
@@ -103,7 +103,8 @@
rotation: true # enable rotation on the
log file ( strongly recommended )
max_size_kilobytes: 1024 # max size for the log
file before rotating
ignore_models: [] # models not to log
- ignore_internal_actions: true # whether to ignore Diem
internal actions
+ ignore_internal_actions: true # wether to ignore Diem
internal actions
+ enabled: true # wether to log events or
not
event_log_entry.class: dmEventLogEntry # An entry of the event log
@@ -114,6 +115,7 @@
entry_service_name: request_log_entry # service name for an
entry of this log
rotation: true # enable rotation on the
log file ( strongly recommended )
max_size_kilobytes: 1024 # max size for the log
file before rotating
+ enabled: true # wether to log requests
or not
request_log_entry.class: dmRequestLogEntry # An entry of the event log
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/log/dmFileLog.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/log/dmFileLog.php 2010-02-11
17:26:44 UTC (rev 27910)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/log/dmFileLog.php 2010-02-11
17:42:08 UTC (rev 27911)
@@ -9,15 +9,6 @@
$options,
$nbFields;
- public function getDefaultOptions()
- {
- return array_merge(parent::getDefaultOptions(), array(
- 'rotation' => true,
- 'max_size_kilobytes' => 2,
- 'buffer_size' => 1024 * 16
- ));
- }
-
public function __construct(sfEventDispatcher $dispatcher, dmFileSystem
$filesystem, sfServiceContainer $serviceContainer, array $options = array())
{
$this->dispatcher = $dispatcher;
@@ -26,6 +17,16 @@
$this->initialize($options);
}
+
+ public function getDefaultOptions()
+ {
+ return array_merge(parent::getDefaultOptions(), array(
+ 'rotation' => true,
+ 'max_size_kilobytes' => 2,
+ 'buffer_size' => 1024 * 16,
+ 'enabled' => true
+ ));
+ }
public function initialize(array $options)
{
@@ -41,6 +42,11 @@
public function log(array $data)
{
+ if(!$this->getOption('enabled'))
+ {
+ return;
+ }
+
try
{
$this->checkFile();
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/log/request/dmRequestLog.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/log/request/dmRequestLog.php
2010-02-11 17:26:44 UTC (rev 27910)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/log/request/dmRequestLog.php
2010-02-11 17:42:08 UTC (rev 27911)
@@ -33,12 +33,9 @@
public function listenToContextEndEvent(sfEvent $event)
{
- if (!$event->getSubject()->getRequest()->getParameter('dm_nolog'))
- {
- $this->log(array(
- 'context' => $event->getSubject(),
- 'server' => $_SERVER
- ));
- }
+ $this->log(array(
+ 'context' => $event->getSubject(),
+ 'server' => $_SERVER
+ ));
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-02-11 17:26:44 UTC (rev 27910)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/service/dmBaseServiceContainer.php
2010-02-11 17:42:08 UTC (rev 27911)
@@ -136,6 +136,15 @@
$this->getService('page_i18n_builder')->connect();
}
+
+ /*
+ * Disable logging when request has a dm_nolog parameter
+ */
+ if($this->getService('request')->getParameter('dm_nolog'))
+ {
+ $this->getService('event_log')->setOption('enabled', false);
+ $this->getService('request_log')->setOption('enabled', false);
+ }
}
/**
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
2010-02-11 17:26:44 UTC (rev 27910)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/view/html/link/dmBaseLinkTag.php
2010-02-11 17:42:08 UTC (rev 27911)
@@ -114,11 +114,6 @@
*/
public function params(array $params)
{
- foreach($params as $key => $value)
- {
- $params[$key] = $value;
- }
-
return $this->setOption('params', array_merge($this->get('params',
array()), $params));
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
