lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-224: Added event logs and production caching (#739)

Browse Source 
* Added event logs and production caching

* Added Support: before logs for easy identification

* Added more Support for log errors

* Reverted change to assets precompile check

* Added vendor assets to precompile list

* Travis fix
This commit is contained in:
farhatahmad
2019-08-14 14:25:52 -04:00
committed by Jesus Federico
parent f87c2bfd16
commit 89f36c1766
10 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/users_controller.rb
View File

@ -43,6 +43,8 @@ class UsersController < ApplicationController
# User has passed all validations required
@user.save
logger.info("Support: #{@user.email} user has been created.")
# Set user to pending and redirect if Approval Registration is set
if approval_registration
@user.add_role :pending
@ -161,6 +163,8 @@ class UsersController < ApplicationController
# DELETE /u/:user_uid
def destroy
logger.info("Support: #{current_user.email} is deleting #{@user.email}.")
if current_user && current_user == @user
@user.destroy
session.delete(:user_id)
@ -168,7 +172,7 @@ class UsersController < ApplicationController
begin
@user.destroy
rescue => e
logger.error "Error in user deletion: #{e}"
logger.error "Support: Error in user deletion: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("administrator.flash.delete_fail"))
else
flash[:success] = I18n.t("administrator.flash.delete")
@ -220,7 +224,7 @@ class UsersController < ApplicationController
begin
send_activation_email(@user)
rescue => e
logger.error "Error in email delivery: #{e}"
logger.error "Support: Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
else
flash[:success] = I18n.t("email_sent", email_type: t("verify.verification"))
@ -235,7 +239,7 @@ class UsersController < ApplicationController
send_approval_user_signup_email(@user)
end
rescue => e
logger.error "Error in email delivery: #{e}"
logger.error "Support: Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
end
end
@ -245,6 +249,8 @@ class UsersController < ApplicationController
valid_user = @user.valid?
valid_captcha = Rails.configuration.recaptcha_enabled ? verify_recaptcha(model: @user) : true
logger.error("Support: #{@user.email} creation failed: User params are not valid.") unless valid_user
valid_user && valid_captcha
end