site24x7_apminsight 1.7.2 → 1.7.3.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -24,7 +24,7 @@ module ManageEngine
24
24
  @alreadyconnected = checkAgentInfo
25
25
  @site24x7 = checkLicenseFile
26
26
  if (@site24x7)
27
- @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @obj.constants.site24x7USurl
27
+ @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @license_key.start_with?('au_') ? @obj.constants.site24x7AUurl : @license_key.start_with?('in_') ? @obj.constants.site24x7INurl : @obj.constants.site24x7USurl
28
28
  end
29
29
  @db_operations =["select","insert","update","delete"]
30
30
  urlMergePattern
@@ -315,14 +315,20 @@ module ManageEngine
315
315
  end
316
316
 
317
317
  def getDispatcher
318
- dispatcher = "unknown"
319
- if defined?(PhusionPassenger) then
320
- dispatcher = "passenger"
321
- end
322
- if defined?(::Unicorn) && defined?(::Unicorn::HttpServer) then
323
- dispatcher = "unicorn"
324
- end
325
- dispatcher
318
+
319
+ @obj.log.info "Server: #{ENV['SERVER_SOFTWARE']}"
320
+
321
+ dispatcher = "unknown"
322
+ if defined?(PhusionPassenger) then
323
+ dispatcher = "passenger"
324
+ end
325
+ if defined?(Unicorn) then
326
+ dispatcher = "unicorn"
327
+ end
328
+ if defined?(Rainbows) then
329
+ dispatcher = "rainbows"
330
+ end
331
+ dispatcher
326
332
  end
327
333
 
328
334
  def isInteger default,value
@@ -116,6 +116,14 @@ module ManageEngine
116
116
  old_object.bind(self).call(worker)
117
117
  end
118
118
  end
119
+ when 'rainbows'
120
+ Rainbows::HttpServer.class_eval do
121
+ old_object = instance_method(:worker_loop)
122
+ define_method(:worker_loop) do |worker|
123
+ ::ManageEngine::APMObjectHolder.instance.agent.doCollect
124
+ old_object.bind(self).call(worker)
125
+ end
126
+ end
119
127
  else#case
120
128
 
121
129
  end#case
@@ -21,7 +21,9 @@ module ManageEngine
21
21
 
22
22
  def detect_and_instrument
23
23
  @framework ||= SUPPORTED_FRAMEWORKS.detect{ |framework| framework.present? }
24
- @framework.instrument
24
+ if (@framework != nil)
25
+ @framework.instrument
26
+ end
25
27
 
26
28
  DATABASE_INTERCEPTORS.each do |interceptor|
27
29
  if (interceptor.present?)
@@ -3,7 +3,7 @@ module ManageEngine
3
3
  class APMConstants
4
4
 
5
5
  attr_reader :apm_gem,:s247_apm_gem,:apm_conf,:agent_conf,:connection_open_timeout,:connection_read_timeout,:connect_uri,:connect_data_uri,:connect_trace_uri,:connect_config_update_uri,:mergepattern_conf
6
- attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl
6
+ attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl
7
7
  attr_reader :licence_exceeds,:licence_expired,:unmanage_agent,:manage_agent,:agent_config_updated,:error_notfound,:error_server,:delete_agent,:response_code,:custom_config_info, :agent_specific_info
8
8
  attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
9
9
  attr_reader :mf_logmetric, :mf_logmetric_warning, :mf_exception_st, :mf_err_st, :mf_loginfo, :mf_loginfo_time, :mf_loginfo_level, :mf_loginfo_str, :mf_loginfo_err_clz, :mf_loginfo_st, :mf_loginfo_level_warn
@@ -53,6 +53,8 @@ module ManageEngine
53
53
  @site24x7USurl = "https://plusinsight.site24x7.com/"
54
54
  @site24x7EUurl = "https://plusinsight.site24x7.eu/"
55
55
  @site24x7CNurl = "https://plusinsight.site24x7.cn/"
56
+ @site24x7AUurl = "https://plusinsight.site24x7.au/"
57
+ @site24x7INurl = "https://plusinsight.site24x7.in/"
56
58
 
57
59
  #Response Codes
58
60
  @licence_expired = 701
data/lib/version.rb CHANGED
@@ -6,8 +6,8 @@
6
6
 
7
7
  module ManageEngine
8
8
  class APMInsight
9
- VERSION = '1.7.2'
9
+ VERSION = '1.7.3.0'
10
10
  MAJOR_VERSION = '1.7'
11
- MINOR_VERSION = '2'
11
+ MINOR_VERSION = '3.0'
12
12
  end
13
13
  end
metadata CHANGED
@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 7
8
- - 2
9
- version: 1.7.2
8
+ - 3
9
+ - 0
10
+ version: 1.7.3.0
10
11
  platform: ruby
11
12
  authors:
12
13
  - Adithyan P
@@ -14,7 +15,7 @@ autorequire:
14
15
  bindir: bin
15
16
  cert_chain: []
16
17
 
17
- date: 2018-06-21 00:00:00 +05:30
18
+ date: 2018-12-28 00:00:00 +05:30
18
19
  default_executable:
19
20
  dependencies:
20
21
  - !ruby/object:Gem::Dependency