lib: replace two PG::Connection.connect with PG::Connection.new.

[mailshears.git] / lib / common / roundcube_plugin.rb

diff --git a/lib/common/roundcube_plugin.rb b/lib/common/roundcube_plugin.rb
index 031e3f9ddd725e6b2bc427a323e567c1291300e3..b66c9f603cf2e4c665de427d33f6210108db3b1f 100644 (file)
--- a/lib/common/roundcube_plugin.rb
+++ b/lib/common/roundcube_plugin.rb
@@ -15,13 +15,14 @@ module RoundcubePlugin
   # @param cfg [Configuration] the configuration for this plugin.
   #
   def initialize(cfg)
-    @db_host = cfg.roundcube_dbhost
-    @db_port = cfg.roundcube_dbport
-    @db_opts = cfg.roundcube_dbopts
-    @db_tty  = cfg.roundcube_dbtty
-    @db_name = cfg.roundcube_dbname
-    @db_user = cfg.roundcube_dbuser
-    @db_pass = cfg.roundcube_dbpass
+    @db_hash = {
+      :host     => cfg.roundcube_dbhost,
+      :port     => cfg.roundcube_dbport,
+      :options  => cfg.roundcube_dbopts,
+      :tty      => cfg.roundcube_dbtty,
+      :dbname   => cfg.roundcube_dbname,
+      :user     => cfg.roundcube_dbuser,
+      :password => cfg.roundcube_dbpass }
   end
 
 
@@ -46,15 +47,18 @@ module RoundcubePlugin
   def list_users()
     usernames = []
 
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
+    connection = PG::Connection.new(@db_hash)
 
     sql_query = 'SELECT username FROM users;'
-    connection.query(sql_query) do |result|
-      usernames = result.field_values('username')
-    end
 
-    connection.close()
+    begin
+      connection.query(sql_query) do |result|
+        usernames = result.field_values('username')
+      end
+    ensure
+      # Make sure the connection gets closed even if the query explodes.
+      connection.close()
+    end
 
     return usernames.map{ |u| User.new(u) }
   end
@@ -71,19 +75,20 @@ module RoundcubePlugin
   def get_user_id(user)
     user_id = nil
 
-    connection = PGconn.connect(@db_host, @db_port, @db_opts, @db_tty,
-                                @db_name, @db_user, @db_pass)
-
+    connection = PG::Connection.new(@db_hash)
     sql_query = 'SELECT user_id FROM users WHERE username = $1;'
 
-    connection.query(sql_query, [user.to_s()]) do |result|
-      if result.num_tuples > 0
-        user_id = result[0]['user_id']
+    begin
+      connection.query(sql_query, [user.to_s()]) do |result|
+        if result.num_tuples > 0
+          user_id = result[0]['user_id']
+        end
       end
+    ensure
+      # Make sure the connection gets closed even if the query explodes.
+      connection.close()
     end
 
-    connection.close()
-
     return user_id
   end