Do not acts_as_file if JOB_DIR is an empty string

sonots · May 23, 2014 · 1c52348 · 1c52348
1 parent 19a73a7
commit 1c52348
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/lib/fluentd_server/config.rb b/lib/fluentd_server/config.rb
@@ -14,7 +14,7 @@ def self.database_url
   end
 
   def self.job_dir
-    ENV.fetch('JOB_DIR', 'jobs')
+    ENV['JOB_DIR'] == "" ? nil : ENV.fetch('JOB_DIR', 'jobs')
   end
 
   def self.log_path

diff --git a/lib/fluentd_server/model.rb b/lib/fluentd_server/model.rb
@@ -31,15 +31,18 @@ def new?
 class Task < ActiveRecord::Base
   include Sinatra::Decorator::Decoratable
   include FluentdServer::Logger
-  include ActiveRecord::ActsAsFile
   include TaskRunner # task runnable codes are here
 
-  def filename
-    prefix = "#{self.id.to_s.rjust(4, '0')}" if self.id
-    File.join(FluentdServer::Config.job_dir, "#{prefix}_result.txt") if prefix
-  end
+  if FluentdServer::Config.job_dir
+    include ActiveRecord::ActsAsFile
 
-  acts_as_file :body, :filename => self.instance_method(:filename)
+    def filename
+      prefix = "#{self.id.to_s.rjust(4, '0')}" if self.id
+      File.join(FluentdServer::Config.job_dir, "#{prefix}_result.txt") if prefix
+    end
+
+    acts_as_file :body, :filename => self.instance_method(:filename)
+  end
 
   def new?
     self.id.nil?