Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

RUBY-868 moved textmate config

  • Loading branch information...
commit f6b792ffddc4c62c2565f63dc3d73ba0defd2f6b 1 parent 3d0a0f1
@gnarg gnarg authored
View
4 config.dot
@@ -43,12 +43,12 @@ digraph AgentEnabled {
"[dispatcher]"
"[force_send]"
"[disable_mobile_headers]"
+ "[textmate]"
node[color=red]
"{collect_traces}"
"{transaction_tracer.enabled}"
"{transaction_tracer.enabled}"
- "{textmate}"
"{post_size_limit}"
"{sync_startup}"
"{send_data_on_exit}"
@@ -74,7 +74,6 @@ digraph AgentEnabled {
node[shape=box,color=orange]
"Control#init_plugin"
"Control#apdex_t"
- "Control#use_textmate?"
"Control#post_size_limit"
"Control#sync_startup"
"Control#send_data_on_exit"
@@ -188,7 +187,6 @@ digraph AgentEnabled {
"Control#init_plugin" -> "[disable_samplers]"
"Control#should_log?" -> "[agent_enabled]"
"Control#apdex_t" -> "[apdex_t]"
- "Control#use_textmate?" -> "{textmate}"
"Control#post_size_limit" -> "{post_size_limit}"
"Control#sync_startup" -> "{sync_startup}"
"Control#send_data_on_exit" -> "{send_data_on_exit}"
View
5 lib/new_relic/control/configuration.rb
@@ -73,11 +73,6 @@ def fetch(key, default=nil)
def apdex_t
Agent.config[:apdex_t]
end
-
- # True if we should view files in textmate
- def use_textmate?
- fetch('textmate')
- end
# defaults to 2MiB
def post_size_limit
View
9 ui/helpers/developer_mode_helper.rb
@@ -70,7 +70,7 @@ def url_for_source(trace_line)
rescue
# catch all other exceptions. We're going to create an invalid link below, but that's okay.
end
- if using_textmate?
+ if NewRelic::Agent.config[:textmate]
"txmt://open?url=file://#{file}&line=#{line}"
else
"show_source?file=#{file}&line=#{line}&anchor=selected_line"
@@ -105,7 +105,7 @@ def write_stack_trace_line(trace_line)
# write a link to the source for a trace
def link_to_source(trace)
- image_url = 'file/images/' + (using_textmate? ? "textmate.png" : "file_icon.png")
+ image_url = 'file/images/' + (NewRelic::Agent.config[:textmate] ? "textmate.png" : "file_icon.png")
link_to "<img src=#{image_url} alt=\"View Source\" title=\"View Source\"/>", url_for_source(application_caller(trace))
end
@@ -239,11 +239,6 @@ def file_and_line(stack_trace_line)
end
end
- def using_textmate?
- NewRelic::Control.instance.use_textmate?
- end
-
-
def render_segment_details(segment, depth=0)
@detail_segment_count ||= 0
@detail_segment_count += 1
Please sign in to comment.
Something went wrong with that request. Please try again.