Merge OSEM updates

config/initializers/sentry.rb

@@ -1,6 +1,10 @@
 Sentry.init do |config|
+<<<<<<< HEAD
   config.enabled_environments = %|production staging|
   config.dsn = ENV['SENTRY_DSN']
+=======
+  config.dsn = ENV.fetch('OSEM_SENTRY_DSN', Rails.application.secrets.sentry_dsn)
+>>>>>>> osem-master
   config.breadcrumbs_logger = [:active_support_logger]
 
   # To activate performance monitoring, set one of these options.
@@ -8,6 +12,19 @@ Sentry.init do |config|
   config.traces_sample_rate = 0.5
   # or
   # config.traces_sampler = lambda do |context|
+<<<<<<< HEAD
   #   true
   # end
+=======
+  #  true
+  # end
+
+  # During deployment we touch tmp/restart.txt, let's use its last access time as release.
+  # Unless someone has set a variable of course...
+  osem_version_from_file = nil
+  version_file = File.expand_path('../../tmp/restart.txt', __dir__)
+  osem_version_from_file = File.new(version_file).atime.to_i if File.file?(version_file)
+  osem_version = ENV.fetch('OSEM_SENTRY_RELEASE', osem_version_from_file)
+  config.release = osem_version if osem_version
+>>>>>>> osem-master
 end