diff options
author | mr <mr@mrautenberg.de> | 2011-08-04 18:37:33 +0200 |
---|---|---|
committer | mr <mr@mrautenberg.de> | 2011-08-04 18:37:33 +0200 |
commit | 6f26ea70b05b69fb69a102fb4cec688338c1f7ff (patch) | |
tree | ce05acc8adb8c64ae8cc1ea997d35744b062e35e /lib/environment.rb | |
parent | 6b9e012576857fbc6c51cd86581cca792f367cdf (diff) | |
parent | 7a13c2da03220ad6716fe7da5bfa3403c873d7d1 (diff) |
Merge branch 'release/v2.1.0'v2.1.0
Diffstat (limited to 'lib/environment.rb')
-rw-r--r-- | lib/environment.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/environment.rb b/lib/environment.rb index ffc4f60..6d1bb85 100644 --- a/lib/environment.rb +++ b/lib/environment.rb @@ -27,7 +27,7 @@ end Ohm.connect :thread_safe => true # load mail settings for error messages -load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") +#load File.join config_dir,"mail.rb" if File.exists?(File.join config_dir,"mail.rb") logfile = "#{LOG_DIR}/#{ENV["RACK_ENV"]}.log" #LOGGER = OTLogger.new(logfile,'daily') # daily rotation @@ -40,8 +40,8 @@ else end # Regular expressions for parsing classification data -TRUE_REGEXP = /^(true|active|1|1.0|tox)$/i -FALSE_REGEXP = /^(false|inactive|0|0.0|low tox)$/i +TRUE_REGEXP = /^(true|active|1|1.0|tox|activating)$/i +FALSE_REGEXP = /^(false|inactive|0|0.0|low tox|deactivating)$/i # Task durations DEFAULT_TASK_MAX_DURATION = 36000 |