diff options
| author | Christoph Helma <helma@in-silico.ch> | 2010-05-12 12:31:39 +0200 |
|---|---|---|
| committer | Christoph Helma <helma@in-silico.ch> | 2010-05-12 12:31:39 +0200 |
| commit | 1d0c46a9711050e116147437fbb334bd800324f3 (patch) | |
| tree | 267b7815a9a00f73f254db5d47f6299759071d95 /lib/environment.rb | |
| parent | 0cf1fbcfae7f618f188f8b44051e5fc0724f8728 (diff) | |
Modification for new RestClient: body instead of to_s
Diffstat (limited to 'lib/environment.rb')
| -rw-r--r-- | lib/environment.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/environment.rb b/lib/environment.rb index 44efd6e..c112669 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -40,8 +40,8 @@ if @@config[:database] end end -# mail -#load File.join config_dir,"mail.rb" +# mail for error messages +load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") # hack: store sinatra in global var to make url_for and halt methods accessible before {$sinatra = self unless $sinatra} @@ -136,3 +136,7 @@ XML = Redland::Namespace.new 'http://www.w3.org/2001/XMLSchema#' # Regular expressions for parsing classification data TRUE_REGEXP = /^(true|active|$1^)/ FALSE_REGEXP = /^(false|inactive|$0^)/ + +# Task durations +DEFAULT_TASK_MAX_DURATION = @@config[:default_task_max_duration] +EXTERNAL_TASK_MAX_DURATION = @@config[:external_task_max_duration] |