site24x7_apminsight 1.7.0 → 1.7.2

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 : @obj.constants.site24x7USurl
+			  @site24x7url = @license_key.start_with?('eu_') ? @obj.constants.site24x7EUurl : @license_key.start_with?('cn_') ? @obj.constants.site24x7CNurl : @obj.constants.site24x7USurl
 			end
 			@db_operations =["select","insert","update","delete"]
 			urlMergePattern
@@ -209,9 +209,9 @@ module ManageEngine
 		#Checks whether the given value is Environment Variable
 		def checkAndGetEnvValue(data)
 		  begin
-  			value = "#{data}"[/{(.*)}/,1]
+  			value = "#{data}"[/\{(.*)\}/,1]
   			if (value != nil && ENV.has_key?(value))
-  				return data.gsub(/{.*}/, ENV[value])
+  				return data.gsub(/\{.*\}/, ENV[value])
 			  end
 			rescue Exception=>e
 			end

data/lib/agent/metrics/am_metricsparser.rb

@@ -142,8 +142,8 @@ module ManageEngine
   				end
   			end
 			rescue Exception=>e
-				@obj.log.info "Exception in getTranseData: #{e}"
-				@obj.log.logException "#{e.message}",e
+				#@obj.log.logException "Exception in getTranseData: #{e.message}",e
+				raise e
 			end
 			ret
 		end

data/lib/agent/util/am_constants.rb

@@ -2,7 +2,8 @@
 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,:site24x7USurl, :site24x7EUurl, :mergepattern_conf
+		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 :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
@@ -49,9 +50,9 @@ module ManageEngine
 			@connect_config_update_uri="arh/agent_config_update?instance_id="
 			
 			#Site24x7 url for agent communication
-			@site24x7USurl="https://plusinsight.site24x7.com/"
-
+			@site24x7USurl = "https://plusinsight.site24x7.com/"
 			@site24x7EUurl = "https://plusinsight.site24x7.eu/"
+      @site24x7CNurl = "https://plusinsight.site24x7.cn/"
 			
 			#Response Codes 
 			@licence_expired = 701

data/lib/version.rb

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

metadata

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