site24x7_apminsight 1.7.2 → 1.7.3.0

data/lib/agent/configuration/am_configuration.rb

@@ -24,7 +24,7 @@ module ManageEngine
 			@alreadyconnected = checkAgentInfo
 			@site24x7 = checkLicenseFile
 			if (@site24x7)
-			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @obj.constants.site24x7USurl
+			  @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
 			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
@@ -315,14 +315,20 @@ module ManageEngine
 		end
 
 		def getDispatcher
-		dispatcher = "unknown"
-		if defined?(PhusionPassenger) then
-			dispatcher = "passenger"
-		end
-		if defined?(::Unicorn) && defined?(::Unicorn::HttpServer) then
-		  dispatcher = "unicorn"
-		end
-		dispatcher
+		  
+		  @obj.log.info "Server: #{ENV['SERVER_SOFTWARE']}"
+		  
+  		dispatcher = "unknown"
+  		if defined?(PhusionPassenger) then
+  			dispatcher = "passenger"
+  		end
+  		if defined?(Unicorn) then
+  		  dispatcher = "unicorn"
+  		end
+  		if defined?(Rainbows) then
+  		  dispatcher = "rainbows"
+  		end
+  		dispatcher
 		end
 		
 		def isInteger default,value

data/lib/agent/server/am_agent.rb

@@ -116,6 +116,14 @@ module ManageEngine
      		       old_object.bind(self).call(worker)
      		     end
      		   end
+				when 'rainbows'
+				  Rainbows::HttpServer.class_eval do
+           old_object = instance_method(:worker_loop)
+           define_method(:worker_loop) do |worker|
+             ::ManageEngine::APMObjectHolder.instance.agent.doCollect
+             old_object.bind(self).call(worker)
+           end
+				 end
 				else#case
 
 				end#case

data/lib/agent/server/instrument/environment.rb

@@ -21,7 +21,9 @@ module ManageEngine
     
     def detect_and_instrument
       @framework ||= SUPPORTED_FRAMEWORKS.detect{ |framework| framework.present? }
-      @framework.instrument
+      if (@framework != nil)
+        @framework.instrument
+      end
       
       DATABASE_INTERCEPTORS.each do |interceptor|
         if (interceptor.present?)

data/lib/agent/util/am_constants.rb

@@ -3,7 +3,7 @@ module ManageEngine
 	class APMConstants
 
 		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
-		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl 
+		attr_reader :site24x7USurl, :site24x7EUurl, :site24x7CNurl, :site24x7INurl, :site24x7AUurl
 		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
 		attr_reader :mf_transaction,:mf_separator,:mf_db,:mf_apdex,:mf_namespace,:mf_name,:mf_all,:agent_store,:agent_lock,:mf_overflow
 		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
 			@site24x7USurl = "https://plusinsight.site24x7.com/"
 			@site24x7EUurl = "https://plusinsight.site24x7.eu/"
       @site24x7CNurl = "https://plusinsight.site24x7.cn/"
+      @site24x7AUurl = "https://plusinsight.site24x7.au/"
+      @site24x7INurl = "https://plusinsight.site24x7.in/"
 			
 			#Response Codes 
 			@licence_expired = 701

data/lib/version.rb

@@ -6,8 +6,8 @@
 
 module ManageEngine
   class APMInsight
-    VERSION = '1.7.2'
+    VERSION = '1.7.3.0'
     MAJOR_VERSION = '1.7'
-    MINOR_VERSION = '2'
+    MINOR_VERSION = '3.0'
   end
 end

metadata

@@ -5,8 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 2
-  version: 1.7.2
+  - 3
+  - 0
+  version: 1.7.3.0
 platform: ruby
 authors: 
 - Adithyan P
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2018-06-21 00:00:00 +05:30
+date: 2018-12-28 00:00:00 +05:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency