Merge pull request #385 from mprasil/update_revision_retry

Retry updating revision - fixes #383

src/api/core/ciphers.rs

@@ -842,7 +842,7 @@ fn move_cipher_selected(data: JsonUpcase<MoveCipherData>, headers: Headers, conn
     }
 
     for uuid in data.Ids {
-        let mut cipher = match Cipher::find_by_uuid(&uuid, &conn) {
+        let cipher = match Cipher::find_by_uuid(&uuid, &conn) {
             Some(cipher) => cipher,
             None => err!("Cipher doesn't exist"),
         };
@@ -853,12 +853,11 @@ fn move_cipher_selected(data: JsonUpcase<MoveCipherData>, headers: Headers, conn
 
         // Move cipher
         cipher.move_to_folder(data.FolderId.clone(), &user_uuid, &conn)?;
-        cipher.save(&conn)?;
 
         nt.send_cipher_update(
             UpdateType::CipherUpdate,
             &cipher,
-            &User::update_uuid_revision(&user_uuid, &conn),
+            &[user_uuid.clone()]
         );
     }
 

src/db/models/user.rs

@@ -184,10 +184,12 @@ impl User {
 
     pub fn update_revision(&mut self, conn: &DbConn) -> EmptyResult {
         self.updated_at = Utc::now().naive_utc();
-        diesel::update(users::table.filter(users::uuid.eq(&self.uuid)))
+        crate::util::retry( || {
-            .set(users::updated_at.eq(&self.updated_at))
+            diesel::update(users::table.filter(users::uuid.eq(&self.uuid)))
-            .execute(&**conn)
+                .set(users::updated_at.eq(&self.updated_at))
-            .map_res("Error updating user revision")
+                .execute(&**conn)
+        }, 10)
+        .map_res("Error updating user revision")
     }
 
     pub fn find_by_mail(mail: &str, conn: &DbConn) -> Option<Self> {