From 2629f2a59fce141c333c8561db63d9571b8a9f9d Mon Sep 17 00:00:00 2001 From: Glenn Gillen Date: Wed, 11 Apr 2012 12:15:24 -0700 Subject: [PATCH] Remove DB_URL constant. Parse URL directly in connection object. --- lib/queue_classic.rb | 5 ----- lib/queue_classic/conn.rb | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/queue_classic.rb b/lib/queue_classic.rb index c51a5101..e8429796 100644 --- a/lib/queue_classic.rb +++ b/lib/queue_classic.rb @@ -18,11 +18,6 @@ module QC SqlFunctions = File.join(QC::Root, "/sql/ddl.sql") DropSqlFunctions = File.join(QC::Root, "/sql/drop_ddl.sql") - DB_URL = - ENV["QC_DATABASE_URL"] || - ENV["DATABASE_URL"] || - raise(ArgumentError, "missing QC_DATABASE_URL or DATABASE_URL") - # You can use the APP_NAME to query for # postgres related process information in the # pg_stat_activity table. Don't set this unless diff --git a/lib/queue_classic/conn.rb b/lib/queue_classic/conn.rb index 276c49e3..7d2caca9 100644 --- a/lib/queue_classic/conn.rb +++ b/lib/queue_classic/conn.rb @@ -84,7 +84,11 @@ def connect end def db_url - URI.parse(DB_URL) + return @db_url if @db_url + url = ENV["QC_DATABASE_URL"] || + ENV["DATABASE_URL"] || + raise(ArgumentError, "missing QC_DATABASE_URL or DATABASE_URL") + @db_url = URI.parse(url) end def log(msg)