Merge pull request QueueClassic#56 from glenngillen/master

Lazy evaluate database URL
jsuchal · Apr 11, 2012 · 0ac05e5 · 0ac05e5
2 parents 6057420 + 2629f2a
commit 0ac05e5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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)