Changeset 5403 in subversion

Timestamp:

Nov 9, 2011 8:40:23 AM (19 months ago)

Author:

thomasb

Message:

Consider replication delays in session storage

Location:

trunk/roundcubemail/program

Files:

• include/rcube_session.php (modified) (1 diff)
• steps/mail/compose.inc (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_session.php

@@ -391 +391 @@
     $this->destroy(session_id());
     rcmail::setcookie($this->cookiename, '-del-', time() - 60);
+  }
+
+
+  /**
+   * Re-read session data from storage backend
+   */
+  public function reload()
+  {
+    if ($this->key && $this->memcache)
+      $this->mc_read($this->key);
+    else if ($this->key)
+      $this->db_read($this->key);
   }
 

trunk/roundcubemail/program/steps/mail/compose.inc

@@ -31 +31 @@
 $COMPOSE_ID = get_input_value('_id', RCUBE_INPUT_GET);
 $_SESSION['compose'] = $_SESSION['compose_data_'.$COMPOSE_ID];
+
+// give replicated session storage some time to synchronize
+$retries = 0;
+while ($COMPOSE_ID && !is_array($_SESSION['compose']) && $RCMAIL->db->is_replicated() && $retries++ < 5) {
+  usleep(500000);
+  $RCMAIL->session->reload();
+  $_SESSION['compose'] = $_SESSION['compose_data_'.$COMPOSE_ID];
+}
 
 // Nothing below is called during message composition, only at "new/forward/reply/draft" initialization or