X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fmv%2Fplugins%2Fagendav.rb;h=9623c4076c5cdd7f4cb535ccccea445699d25a64;hp=80ab1b6013c4096395ff0ec33a96a02dc023ddb0;hb=b947ef8844f090eedd50be0383abe417d910bb1a;hpb=df4e02ebf6a4e28a58abcb298a4442a245ad0b15

diff --git a/lib/mv/plugins/agendav.rb b/lib/mv/plugins/agendav.rb
index 80ab1b6..9623c40 100644
--- a/lib/mv/plugins/agendav.rb
+++ b/lib/mv/plugins/agendav.rb
@@ -32,14 +32,15 @@ class AgendavMv
     sql_queries << 'UPDATE shared SET user_from = $1 WHERE user_from = $2;'
     sql_queries << 'UPDATE shared SET user_which = $1 WHERE user_which = $2;'
 
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
-
-    sql_queries.each do |sql_query|
-      connection.query(sql_query, [dst.to_s(), src.to_s()])
+    connection = PG::Connection.new(@db_hash)
+    begin
+      sql_queries.each do |sql_query|
+        connection.query(sql_query, [dst.to_s(), src.to_s()])
+      end
+    ensure
+      # Make sure the connection gets closed even if a query explodes.
+      connection.close()
     end
-
-    connection.close()
   end
 
 end