Skip to content

Fix syntax && sentry issues #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix syntax && sentry issues #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions lib/travis/listener/app.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class App < Sinatra::Base
end

get '/' do
redirect "http://travis-ci.com"
redirect 'http://travis-ci.com'
end

# Used for new relic uptime monitoring
Expand Down Expand Up @@ -77,7 +77,7 @@ def replace_bot_sender
return unless payload && decoded_payload.dig('sender', 'type')&.downcase == 'bot'

payload_data = JSON.parse(payload)
payload_data['sender']= {
payload_data['sender'] = {
type: 'User',
github_id: 0,
vcs_id: '0',
Expand Down Expand Up @@ -129,10 +129,10 @@ def dispatch_event

def handle_event?
if accepted_event_excluding_checks? || rerequested_check?
Metriks.meter("listener.handle.accept").mark
Metriks.meter('listener.handle.accept').mark
true
else
Metriks.meter("listener.handle.reject").mark
Metriks.meter('listener.handle.reject').mark
false
end
end
Expand All @@ -153,7 +153,7 @@ def rerequested_check?
end

def checks_event?
['check_run', 'check_suite'].include?(event_type)
%w[check_run check_suite].include?(event_type)
end

def tag_created_check_suite?
Expand All @@ -163,21 +163,21 @@ def tag_created_check_suite?

def log_event
details = {
uuid: uuid,
uuid: uuid,
delivery_guid: delivery_guid,
type: event_type
type: event_type
}

info(details.merge(event_details).map{|k,v| "#{k}=#{v}"}.join(" "))
info(details.merge(event_details).map { |k, v| "#{k}=#{v}"}.join(' '))
end

def data
{
:type => event_type,
:payload => payload,
:uuid => uuid,
:github_guid => delivery_guid,
:github_event => event_type,
type: event_type,
payload: payload,
uuid: uuid,
github_guid: delivery_guid,
github_event: event_type
}
end

Expand All @@ -195,15 +195,15 @@ def delivery_guid

def integration_type
if !params[:payload].blank?
"webhook"
'webhook'
else
"github_apps"
'github_apps'
end
end

def event_details
Schemas.event_details(event_type, decoded_payload)
rescue => e
rescue StandardError => e
error("Error logging payload: #{e.message}")
error("Payload causing error: #{decoded_payload}")
Raven.capture_exception(e)
Expand Down Expand Up @@ -240,20 +240,18 @@ def payload
params[:payload]
elsif !request_body.blank?
request_body
else
nil
end
end

def request_body
@_request_body ||= begin
request.body.rewind
request.body.read.force_encoding("utf-8")
request.body.read.force_encoding('utf-8')
end
end

def report_memory_usage
Metriks.gauge("listener.gc.heap_live_slots").set(GC.stat[:heap_live_slots])
Metriks.gauge('listener.gc.heap_live_slots').set(GC.stat[:heap_live_slots])
end
end
end
Expand Down
25 changes: 14 additions & 11 deletions lib/travis/listener/schemas.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,37 +144,40 @@ def self.event_details(event_type, payload)
source: payload['pull_request']['head']['repo'] && payload['pull_request']['head']['repo']['full_name'],
head: payload['pull_request']['head']['sha'][0..6],
ref: payload['pull_request']['head']['ref'],
user: payload['pull_request']['head']['user']['login'],
sender: payload['sender']['login'],
sender_type: payload['sender']['type']
user: payload.dig('pull_request', 'head', 'user', 'login'),
sender: payload.dig('sender', 'login'),
sender_type: payload.dig('sender', 'type')
}
when 'push'
{
repository: payload["repository"]["full_name"],
ref: payload['ref'],
head: payload['head_commit'] && payload['head_commit']['id'][0..6],
commits: (payload["commits"] || []).map {|c| c['id'][0..6]}.join(","),
sender: payload['sender']['login'],
sender_type: payload['sender']['type']
sender: payload.dig('sender', 'login'),
sender_type: payload.dig('sender', 'type')
}
when 'check_suite'
{
action: payload['action'],
ref_type: payload['check_suite']['ref_type'],
repository: payload["repository"]["full_name"],
sender: payload['sender']['login']
action: payload['action'],
ref_type: payload['check_suite']['ref_type'],
repository: payload["repository"]["full_name"],
sender: payload.dig('sender', 'login'),
sender_type: payload.dig('sender', 'type')
}
when 'create', 'delete', 'repository', 'check_run'
{
action: payload['action'],
repository: payload["repository"]["full_name"],
sender: payload['sender']['login']
sender: payload.dig('sender', 'login'),
sender_type: payload.dig('sender', 'type')
}
when 'installation', 'installation_repositories'
{
action: payload['action'],
installation: payload["installation"]["account"]["login"],
sender: payload['sender']['login']
sender: payload.dig('sender', 'login'),
sender_type: payload.dig('sender', 'type')
}
else
{ }
Expand Down