Fix session storage with postgres

Author: a.anokhin

session/src/lmbSessionDbStorage.class.php

@@ -2,9 +2,9 @@
 /*
  * Limb PHP Framework
  *
- * @link http://limb-project.com 
+ * @link http://limb-project.com
  * @copyright  Copyright © 2004-2009 BIT(http://bit-creative.com)
- * @license    LGPL http://www.gnu.org/copyleft/lesser.html 
+ * @license    LGPL http://www.gnu.org/copyleft/lesser.html
  */
 lmb_require('limb/session/src/lmbSessionStorage.interface.php');
 lmb_require('limb/dbal/src/criteria/lmbSQLFieldCriteria.class.php');
@@ -108,13 +108,15 @@ function storageWrite($session_id, $value)
     $data = array('last_activity_time' => time(),
                   'session_data' => $value);
 
+    $this->db->begin();
     if($rs->count() > 0)
       $this->db->update('lmb_session', $data, $crit);
     else
     {
       $data['session_id'] = "{$session_id}";
       $this->db->insert('lmb_session', $data, null);
     }
+    $this->db->commit();
   }
 
   /**
@@ -124,8 +126,10 @@ function storageWrite($session_id, $value)
    */
   function storageDestroy($session_id)
   {
+    $this->db->begin();
     $this->db->delete('lmb_session',
                       new lmbSQLFieldCriteria('session_id', $session_id));
+    $this->db->commit();
   }
 
   /**
@@ -139,8 +143,10 @@ function storageGc($max_life_time)
     if($this->max_life_time)
       $max_life_time = $this->max_life_time;
 
+    $this->db->begin();
     $this->db->delete('lmb_session',
                       new lmbSQLFieldCriteria('last_activity_time', time() - $max_life_time, lmbSQLFieldCriteria::LESS));
+    $this->db->commit();
   }
 }
 

web_app/src/filter/lmbSessionStartupFilter.class.php

@@ -27,10 +27,11 @@ class lmbSessionStartupFilter implements lmbInterceptingFilter
    * @see lmbInterceptingFilter :: run()
    * @uses LIMB_SESSION_USE_DB_DRIVER
    */
-  function run($filter_chain, $session_in_db = false, $session_in_db_lifetime = null)
+  function run($filter_chain)
   {
+    $session_in_db = defined('LIMB_SESSION_USE_DB_DRIVER') ? LIMB_SESSION_USE_DB_DRIVER : false;
     if($session_in_db)
-      $storage =  $this->_createDBSessionStorage($session_in_db_lifetime);
+      $storage =  $this->_createDBSessionStorage();
     else
       $storage =  $this->_createNativeSessionStorage();
 
@@ -50,8 +51,10 @@ protected function _createNativeSessionStorage()
    * Creates object of {@link lmbSessionDbStorage} class.
    * @see lmbInterceptingFilter :: run()
    */
-  protected function _createDBSessionStorage($lifetime)
+  protected function _createDBSessionStorage()
   {
+    $lifetime = defined('LIMB_SESSION_DB_MAX_LIFE_TIME') ? LIMB_SESSION_DB_MAX_LIFE_TIME : null;
+
     lmb_require('limb/session/src/lmbSessionDbStorage.class.php');
     $db_connection = lmbToolkit :: instance()->getDefaultDbConnection();
     return new lmbSessionDbStorage($db_connection, $lifetime);