Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop

app/models/edu_setting.rb

@@ -1,19 +1,19 @@
-# == Schema Information
-#
-# Table name: edu_settings
-#
-#  id          :integer          not null, primary key
-#  name        :string(255)
-#  value       :string(255)
-#  created_at  :datetime         not null
-#  updated_at  :datetime         not null
-#  description :string(255)
-#
-# Indexes
-#
-#  index_edu_settings_on_name  (name) UNIQUE
-#
-
+# == Schema Information
+#
+# Table name: edu_settings
+#
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  value       :string(255)
+#  created_at  :datetime         not null
+#  updated_at  :datetime         not null
+#  description :string(255)
+#
+# Indexes
+#
+#  index_edu_settings_on_name  (name) UNIQUE
+#
+
 
 class EduSetting < ApplicationRecord
   after_commit :expire_value_cache
@@ -25,7 +25,11 @@ class EduSetting < ApplicationRecord
   end
 
   def self.get(key)
-    Rails.cache.fetch(value_cache_key(key), expires_in: 1.days) do
+    begin
+      Rails.cache.fetch(value_cache_key(key), expires_in: 1.days) do
+        find_by_name(key.to_s)&.value
+      end
+    rescue Exception => e
       find_by_name(key.to_s)&.value
     end
   end