X-Git-Url: http://gitweb.michael.orlitzky.com/?p=mailshears.git;a=blobdiff_plain;f=lib%2Fcommon%2Fdavical_plugin.rb;h=ba09770deee3eff9d8483f76d70e23a5f99dfb2e;hp=8684cca9e830a5005e98ef82c7ac916f511decf6;hb=b947ef8844f090eedd50be0383abe417d910bb1a;hpb=58849f9ba58bd0804ffe6c6d8248caf2ab66dc66

diff --git a/lib/common/davical_plugin.rb b/lib/common/davical_plugin.rb
index 8684cca..ba09770 100644
--- a/lib/common/davical_plugin.rb
+++ b/lib/common/davical_plugin.rb
@@ -14,13 +14,14 @@ module DavicalPlugin
   # @param cfg [Configuration] the configuration for this plugin.
   #
   def initialize(cfg)
-    @db_host = cfg.davical_dbhost
-    @db_port = cfg.davical_dbport
-    @db_opts = cfg.davical_dbopts
-    @db_tty  = cfg.davical_dbtty
-    @db_name = cfg.davical_dbname
-    @db_user = cfg.davical_dbuser
-    @db_pass = cfg.davical_dbpass
+    @db_hash = {
+      :host     => cfg.davical_dbhost,
+      :port     => cfg.davical_dbport,
+      :options  => cfg.davical_dbopts,
+      :tty      => cfg.davical_dbtty,
+      :dbname   => cfg.davical_dbname,
+      :user     => cfg.davical_dbuser,
+      :password => cfg.davical_dbpass }
   end
 
 
@@ -48,18 +49,20 @@ module DavicalPlugin
   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)
 
     # User #1 is the super-user, and not tied to an email address.
-    sql_query = 'SELECT username FROM usr WHERE user_no > 1'
+    sql_query = 'SELECT username FROM usr WHERE user_no > 1;'
 
-    connection.query(sql_query) do |result|
-      usernames = result.field_values('username')
+    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
 
-    connection.close()
-
     return usernames.map{ |u| User.new(u) }
   end
 
@@ -77,22 +80,24 @@ module DavicalPlugin
   def get_principal_id(user)
     principal_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 principal.principal_id '
     sql_query += 'FROM (principal INNER JOIN usr '
     sql_query += '      ON principal.user_no = usr.user_no) '
     sql_query += 'WHERE usr.username = $1;'
 
-    connection.query(sql_query, [user.to_s()]) do |result|
-      if result.num_tuples > 0
-        principal_id = result[0]['principal_id']
+    begin
+      connection.query(sql_query, [user.to_s()]) do |result|
+        if result.num_tuples > 0
+          principal_id = result[0]['principal_id']
+        end
       end
+    ensure
+      # Make sure the connection gets closed even if the query explodes.
+      connection.close()
     end
 
-    connection.close()
-
     return principal_id
   end