Make login_counter instance variable instead of class one.
+ remove unecessarey require + fix small formatiing issues
This commit is contained in:
parent
394e962e52
commit
770f07cd5c
|
|
@ -1,5 +1,3 @@
|
||||||
require 'prometheus/client/formats/text'
|
|
||||||
|
|
||||||
class HealthController < ActionController::Base
|
class HealthController < ActionController::Base
|
||||||
protect_from_forgery with: :exception
|
protect_from_forgery with: :exception
|
||||||
include RequiresHealthToken
|
include RequiresHealthToken
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,10 @@
|
||||||
class MetricsController < ActionController::Base
|
class MetricsController < ActionController::Base
|
||||||
protect_from_forgery with: :exception
|
|
||||||
before_action :validate_prometheus_metrics
|
|
||||||
include RequiresHealthToken
|
include RequiresHealthToken
|
||||||
|
|
||||||
|
protect_from_forgery with: :exception
|
||||||
|
|
||||||
|
before_action :validate_prometheus_metrics
|
||||||
|
|
||||||
def metrics
|
def metrics
|
||||||
response = "#{metrics_service.health_metrics_text}\n#{metrics_service.prometheus_metrics_text}"
|
response = "#{metrics_service.health_metrics_text}\n#{metrics_service.prometheus_metrics_text}"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@ class SessionsController < Devise::SessionsController
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
def self.login_counter
|
def login_counter
|
||||||
@login_counter ||= Gitlab::Metrics.counter(:user_session_logins, 'User logins count')
|
@login_counter ||= Gitlab::Metrics.counter(:user_session_logins, 'User logins count')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -129,7 +129,7 @@ class SessionsController < Devise::SessionsController
|
||||||
end
|
end
|
||||||
|
|
||||||
def log_user_activity(user)
|
def log_user_activity(user)
|
||||||
SessionsController.login_counter.increment
|
login_counter.increment
|
||||||
Users::ActivityService.new(user, 'login').execute
|
Users::ActivityService.new(user, 'login').execute
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
class AddPrometheusSettingsToMetricsSettings < ActiveRecord::Migration
|
class AddPrometheusSettingsToMetricsSettings < ActiveRecord::Migration
|
||||||
include Gitlab::Database::MigrationHelpers
|
include Gitlab::Database::MigrationHelpers
|
||||||
|
|
||||||
disable_ddl_transaction!
|
disable_ddl_transaction!
|
||||||
|
|
||||||
DOWNTIME = false
|
DOWNTIME = false
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue