From 4b954b14b30c4a2753b08205c3ff0dc7e91c9f31 Mon Sep 17 00:00:00 2001 From: szetobo Date: Thu, 17 Nov 2011 10:57:00 +0800 Subject: [PATCH] delay evaluation of environment variable --- lib/queue_classic/database.rb | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/queue_classic/database.rb b/lib/queue_classic/database.rb index db768f5f..acf36d4e 100644 --- a/lib/queue_classic/database.rb +++ b/lib/queue_classic/database.rb @@ -3,10 +3,10 @@ class Database @@connection = nil - DATABASE_URL = (ENV["QC_DATABASE_URL"] || ENV["DATABASE_URL"]) - MAX_TOP_BOUND = (ENV["QC_TOP_BOUND"] || 9).to_i - NOTIFY_TIMEOUT = (ENV["QC_NOTIFY_TIMEOUT"] || 10).to_i - DEFAULT_QUEUE_NAME = "queue_classic_jobs" + # DATABASE_URL = (ENV["QC_DATABASE_URL"] || ENV["DATABASE_URL"]) + # MAX_TOP_BOUND = (ENV["QC_TOP_BOUND"] || 9).to_i + # NOTIFY_TIMEOUT = (ENV["QC_NOTIFY_TIMEOUT"] || 10).to_i + # DEFAULT_QUEUE_NAME = "queue_classic_jobs" attr_reader :table_name attr_reader :top_boundary @@ -14,17 +14,18 @@ class Database def initialize(queue_name=nil) log("initialized") - @top_boundary = MAX_TOP_BOUND + @top_boundary = (ENV["QC_TOP_BOUND"] || 9).to_i log("top_boundary=#{@top_boundary}") - @table_name = queue_name || DEFAULT_QUEUE_NAME + @table_name = queue_name || "queue_classic_jobs" log("table_name=#{@table_name}") @channel_name = @table_name log("channel_name=#{@channel_name}") - @db_params = URI.parse(DATABASE_URL) - log("uri=#{DATABASE_URL}") + db_url = (ENV["QC_DATABASE_URL"] || ENV["DATABASE_URL"]) + @db_params = URI.parse(db_url) + log("uri=#{db_url}") end def set_application_name