summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormguetlein <martin.guetlein@gmail.com>2010-05-27 13:59:32 +0200
committermguetlein <martin.guetlein@gmail.com>2010-05-27 13:59:32 +0200
commit576007f75c8fe7e6f7e76706ee9bc2ada6da08ca (patch)
treea0c3f8bf0d11caf7f6bdb18c4642fff031887b48 /lib
parent487bed8235064411d15129a797c91bd3b3bda99c (diff)
rest task wait time
Diffstat (limited to 'lib')
-rw-r--r--lib/environment.rb1
-rw-r--r--lib/task.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/environment.rb b/lib/environment.rb
index 75fdc7e..d24c37d 100644
--- a/lib/environment.rb
+++ b/lib/environment.rb
@@ -13,6 +13,7 @@ LOG_DIR = File.join(basedir, "log")
if File.exist?(config_file)
@@config = YAML.load_file(config_file)
+ raise "could not load config, config file: "+config_file.to_s unless @@config
else
FileUtils.mkdir_p TMP_DIR
FileUtils.mkdir_p LOG_DIR
diff --git a/lib/task.rb b/lib/task.rb
index 0b366b1..aace2be 100644
--- a/lib/task.rb
+++ b/lib/task.rb
@@ -1,7 +1,7 @@
LOGGER.progname = File.expand_path(__FILE__)
DEFAULT_TASK_MAX_DURATION = 10*60*60
-EXTERNAL_TASK_MAX_DURATION = 10*60
+EXTERNAL_TASK_MAX_DURATION = 10*60*60
$self_task=nil