aliyun_sls_sdk 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9966f404993efd0e805ec1883d5fbdd512bbe26a
-  data.tar.gz: 8a2607f56f847a7b894960b1d12cd4d21d9e3253
+  metadata.gz: 9cc8dd23dc081504838e6cd2b4c8cc50dfe504a9
+  data.tar.gz: 3934f12ddfd4f13221bf5a0c3502f467205cf064
 SHA512:
-  metadata.gz: 6c062dda63f2dc64cffc5791293f084bac9a51e1901d6581bee4abef369cbac8cce8d0c20bb4b7a5edb134325e8aee56e8f6d8279c549221b5cac0580ca60ce9
-  data.tar.gz: ee7c6902e27d82de45e32d1904357fa53078dd3b78fe1a1669d88072f0f4fb840bb78513f7bc8930b8eba91327a006356402192aaa16e5caabddad2977d77725
+  metadata.gz: 8e2a6200ca463e4f83a838f830d858253623379f6b3c3667928b082159ce702ef3b42c13c5ef9279408d654fe362611a4ef9f8913953ce53c7f31efe95cdea2e
+  data.tar.gz: aa2c99f77d280e28948560312e6b0d03ead80b8250efeed8181b540064c65e61859f9c1012b61492835c4a49fa4a299783e7e7fb6f2698cbe208cf7666ef6757

data/lib/aliyun_sls_sdk/get_log_store_response.rb

@@ -0,0 +1,13 @@
+module AliyunSlsSdk
+  class GetLogStoreResponse < LogResponse
+
+    attr_accessor :ttl, :shard_count, :logstore_name
+    def initialize(resp, header)
+      super(header)
+      puts resp
+      @logstore_name = resp["logstoreName"]
+      @ttl = resp["ttl"] ? resp["ttl"].to_i : 0
+      @shard_count = resp["shardCount"] ? resp["shardCount"].to_i : 0
+    end
+  end
+end

data/lib/aliyun_sls_sdk/log_client.rb

@@ -9,12 +9,22 @@ module AliyunSlsSdk
     @@API_VERSION = "0.6.0"
     @@USER_AGENT = "log-ruby-sdk-v-0.6.1"
     @@http = Net::HTTP::Persistent.new
-    def initialize(endpoint, accessKeyId, accessKeySecret)
+    def initialize(endpoint, accessKeyId, accessKeySecret, ssl_verify = false)
       @endpoint = endpoint
       @accessKeyId = accessKeyId
       @accessKeySecret = accessKeySecret
+      @ssl_verify = ssl_verify
     end
 
+    def get_logstore(project_name, logstore_name)
+      headers = {}
+      params = {}
+      resource = "/logstores/" + logstore_name
+      resp, header = send("GET", project_name, nil, resource, params, headers)
+      return GetLogStoreResponse.new(resp, header)
+    end
+
+
     def create_logstore(project_name, logstore_name, ttl, shard_count)
       headers = {}
       params = {}
@@ -101,7 +111,8 @@ module AliyunSlsSdk
       end
       headers['x-log-apiversion'] = @@API_VERSION
       headers['x-log-signaturemethod'] = 'hmac-sha1'
-      url = "http://" + project + "." + @endpoint
+      scheme = @ssl_verify ? "https" : "http"
+      url = "#{scheme}://" + project + "." + @endpoint
       headers['Host'] = project + "." + @endpoint
       headers['Date'] = headers["Date"] = DateTime.now.httpdate
       signature = Util.get_request_authorization(method, resource,
@@ -111,6 +122,18 @@ module AliyunSlsSdk
       return sendRequest(method, url, params, body, headers, respons_body_type)
     end
 
+    def loadJson(respText, requestId)
+      if respText.empty?
+        return nil
+      else
+        begin
+          return JSON.parse(respText)
+        rescue JSON::ParserError => e
+          raise LogException.new("BadResponse", "Bad json format:\n#{respText}", requestId)
+        end
+      end
+    end
+
     def sendRequest(method, url, params, body, headers, respons_body_type = 'json')
       statusCode, respBody, respHeaders = getHttpResponse(method, url, params, body, headers)
       if respHeaders['x-log-requestid']
@@ -121,34 +144,22 @@ module AliyunSlsSdk
 
       if statusCode == '200'
         if respons_body_type == 'json'
-          return respBody.to_json, respHeaders
-        else
-          return respBody, respHeaders
-        end
-      elsif statusCode.to_s =~ /[4|5]\d\d/
-        msg = "status: #{statusCode}, request_id: #{requestId}, body: #{respBody}"
-        if $logger and $logger.respond_to?(:error)
-          $logger.error msg
-        else
-          puts msg
-        end
-        if respons_body_type == 'json'
-          return respBody.to_json, respHeaders
+          return loadJson(respBody, requestId), respHeaders
         else
           return respBody, respHeaders
         end
+      end
+      respJson = loadJson(respBody, requestId)
+      if respJson["errorCode"] and respJson["errorMessage"]
+        raise LogException.new(respJson["errorCode"], respJson["errorMessage"], requestId)
       else
-        msg = "status: #{statusCode}, request_id: #{requestId}, body: #{respBody}"
-        if $logger and $logger.respond_to?(:error)
-          $logger.error msg
+        exStr = ""
+        if respBody
+          exStr = ". Return Json is #{respBody}"
         else
-          puts msg
-        end
-        if respons_body_type == 'json'
-          return respBody.to_json, respHeaders
-        else
-          return respBody, respHeaders
+          exStr = "."
         end
+        raise LogException.new("LogRequestError", "Request is failed. Http code is #{statusCode} #{exStr}", requestId)
       end
     end
 

data/lib/aliyun_sls_sdk/log_exception.rb

@@ -0,0 +1,15 @@
+
+module AliyunSlsSdk
+  class LogException < StandardError
+    attr_accessor :errorCode, :errorMessage, :requestId
+    def initialize(errorCode, errorMessage, requestId)
+      @errorCode = errorCode
+      @errorMessage = errorMessage
+      @requestId = requestId
+    end
+
+    def to_s()
+      "LogException: \n{\n    ErrorCode: #{@errorCode}\n    ErrorMessage: #{@errorMessage}\n    RequestId: #{@requestId}\n}\n"
+    end
+  end
+end

data/lib/aliyun_sls_sdk/version.rb

@@ -1,3 +1,3 @@
 module AliyunSlsSdk
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/aliyun_sls_sdk.rb

@@ -1,5 +1,4 @@
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'version.rb')
-require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'connection.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'protobuf.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_request.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'get_log_request.rb')
@@ -10,6 +9,8 @@ require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'util.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_client.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_item.rb')
 require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'create_log_store_response.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'get_log_store_response.rb')
+require File.join(File.dirname(__FILE__), 'aliyun_sls_sdk', 'log_exception.rb')
 
 module AliyunSlsSdk
   class PostBodyInvalid < RuntimeError;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun_sls_sdk
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - linhua.tlh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -121,10 +121,11 @@ files:
 - README.md
 - aliyun_sls_sdk.gemspec
 - lib/aliyun_sls_sdk.rb
-- lib/aliyun_sls_sdk/connection.rb
 - lib/aliyun_sls_sdk/create_log_store_response.rb
 - lib/aliyun_sls_sdk/get_log_request.rb
+- lib/aliyun_sls_sdk/get_log_store_response.rb
 - lib/aliyun_sls_sdk/log_client.rb
+- lib/aliyun_sls_sdk/log_exception.rb
 - lib/aliyun_sls_sdk/log_item.rb
 - lib/aliyun_sls_sdk/log_request.rb
 - lib/aliyun_sls_sdk/log_response.rb

data/lib/aliyun_sls_sdk/connection.rb

@@ -1,251 +0,0 @@
-require "addressable/uri"
-require 'hmac-sha1'
-require "base64"
-require "zlib"
-require "time"
-require "net/http/persistent"
-require "json"
-
-module AliyunSlsSdk
-  class Connection
-
-    def initialize(project, region_endpoint,  aliyun_access_key_id, aliyun_access_key_secret, opts={})
-      default_headers = {
-          "x-sls-apiversion" => "0.6.0",
-          "x-sls-signaturemethod" => "hmac-sha1"
-      }
-      @headers = default_headers.update opts
-      @aliyun_access_key_id = aliyun_access_key_id
-      @aliyun_access_key_secret = aliyun_access_key_secret
-      @host = "#{project}.#{region_endpoint}"
-      @http = Net::HTTP::Persistent.new
-      # @http.debug_output = $stdout
-    end
-
-    # https://help.aliyun.com/document_detail/29015.html
-    def create_logstore(logStoreName, ttl, shardCount, ssl_verify = false)
-      body = {:logstoreName => logStoreName, :ttl => ttl, :shardCount => shardCount}
-      content = body.to_json
-      # 压缩content数据
-      compressed = Zlib::Deflate.deflate(content.encode.to_s)
-      headers = compact_headers(content, compressed)
-      headers["Authorization"] = signature("POST", nil, headers, content, {})
-      scheme = ssl_verify ? "https" : "http"
-
-      post_uri = URI "#{scheme}://#{@host}/logstores"
-      post = Net::HTTP::Post.new(post_uri.request_uri, headers)
-      post.body = compressed
-      response = @http.request post_uri, post
-      parse_response(response)
-    end
-
-
-    # http://docs.aliyun.com/#/pub/sls/api/apilist&PutLogs
-    def puts_logs(logstorename, content, ssl_verify = false)
-      # 压缩content数据
-      compressed = Zlib::Deflate.deflate(content.encode.to_s)
-      headers = compact_headers(content, compressed)
-      headers["Authorization"] = signature("POST", logstorename, headers, content, {})
-      scheme = ssl_verify ? "https" : "http"
-
-      post_uri = URI "#{scheme}://#{@host}/logstores/#{logstorename}"
-      post = Net::HTTP::Post.new(post_uri.request_uri, headers)
-      post.body = compressed
-      response = @http.request post_uri, post
-      parse_response(response)
-    end
-
-    # http://docs.aliyun.com/#/pub/sls/api/apilist&ListLogstores
-    def list_logstores(ssl_verify = false)
-      headers = compact_headers(nil, nil)
-      headers["Authorization"] = signature("GET", nil, headers, nil, {})
-
-      scheme = ssl_verify ? "https" : "http"
-      get_uri = URI "#{scheme}://#{@host}/logstores"
-      headers["Referer"] = get_uri.to_s
-      get = Net::HTTP::Get.new(get_uri.request_uri, headers)
-      response = @http.request get_uri, get
-      parse_response(response)
-    end
-
-    # http://docs.aliyun.com/#/pub/sls/api/apilist&GetLogs
-    def get_logs(logstorename, ssl_verify=false, opts={})
-      default_opts = {
-          :type => "log",
-          :from => Time.now.to_i - 60*5, #默认是五分钟前
-          :to => Time.now.to_i,
-          #  :line => 100,
-          #  :offset => 0,
-          :reverse => false
-      }
-      opts = default_opts.update opts
-      headers = compact_headers(nil, nil)
-      headers["Authorization"] = signature("GET", logstorename, headers, nil, opts)
-      scheme = ssl_verify ? "https" : "http"
-      get_uri = Addressable::URI.parse("#{scheme}://#{@host}/logstores/#{logstorename}")
-      headers["Referer"] = get_uri.to_s
-      get_uri.query_values = opts
-      get = Net::HTTP::Get.new(get_uri.request_uri, headers)
-      response = @http.request get_uri, get
-      parse_response(response)
-    end
-
-    # http://docs.aliyun.com/#/pub/sls/api/apilist&ListTopics
-    def list_topics(logstorename, ssl_verify=false, opts={})
-      default_opts = {
-          :type => "topic",
-          :line => 100,
-          :toke => ""
-      }
-      opts = default_opts.update opts
-      headers = compact_headers(nil, nil)
-      headers["Authorization"] = signature("GET", logstorename, headers, nil, opts)
-      scheme = ssl_verify ? "https" : "http"
-      get_uri = Addressable::URI.parse("#{scheme}://#{@host}/logstores/#{logstorename}")
-      headers["Referer"] = get_uri.to_s
-      get_uri.query_values = opts
-      get = Net::HTTP::Get.new(get_uri.request_uri, headers)
-      response = @http.request get_uri, get
-      parse_response(response)
-    end
-
-    # http://docs.aliyun.com/#/pub/sls/api/apilist&GetHistograms
-    def get_histograms(logstorename, ssl_verify=false, opts={})
-      default_opts = {
-          :type => "histogram",
-          :from => Time.now.to_i - 60*5, #默认是五分钟前
-          :to => Time.now.to_i,
-          :topic => "",
-          :query => "",
-      }
-      opts = default_opts.update opts
-      headers = compact_headers(nil, nil)
-      headers["Authorization"] = signature("GET", logstorename, headers, nil, opts)
-      scheme = ssl_verify ? "https" : "http"
-      get_uri = Addressable::URI.parse("#{scheme}://#{@host}/logstores/#{logstorename}")
-      headers["Referer"] = get_uri.to_s
-      get_uri.query_values = opts
-      get = Net::HTTP::Get.new(get_uri.request_uri, headers)
-      response = @http.request get_uri, get
-      parse_response(response)
-    end
-
-    private
-
-    def string_to_sign(verb, logstorename, headers, content, query={})
-      if content
-        string_to_sign_with_content(verb, logstorename, headers, query)
-      else
-        string_to_sign_without_content(verb, logstorename, headers, query)
-      end
-    end
-
-    def string_to_sign_with_content(verb, logstorename, headers, query={})
-
-      <<~DOC
-      #{verb}
-      #{headers['Content-MD5']}
-      #{headers['Content-Type']}
-      #{headers['Date']}
-      #{canonicalized_sls_headers(headers)}
-      #{canonicalized_resource(logstorename, query)}
-      DOC
-    end
-
-    def string_to_sign_without_content(verb, logstorename, headers, query={})
-      <<~DOC
-      #{verb}
-
-
-      #{headers['Date']}
-      #{canonicalized_sls_headers(headers)}
-      #{canonicalized_resource(logstorename, query)}
-      DOC
-    end
-
-    # “CanonicalizedSLSHeaders”的构造方式如下：
-    # 1. 将所有以“x-sls-”为前缀的HTTP请求头的名字转换成小写字母；
-    # 2. 将上一步得到的所有SLS自定义请求头按照字典序进行升序排序；
-    # 3. 删除请求头和内容之间分隔符两端出现的任何空格；
-    # 4. 将所有的头和内容用\n分隔符组合成最后的CanonicalizedSLSHeader;
-    def canonicalized_sls_headers(headers)
-      h = {}
-      headers.each { |k, v|
-        if k =~ /x-sls-.*/
-          h[k.downcase] = v
-        end
-      }
-      h.keys.sort.map { |e|
-        h[e]
-        "#{e}:#{h[e].gsub(/^\s+/, '')}"
-      }.join($/)
-    end
-
-    # “CanonicalizedResource”的构造方式如下：
-    # 1. 将CanonicalizedResource设置为空字符串（""）；
-    # 2. 放入要访问的SLS资源："/logstores/logstorename"（无logstorename则不填）；
-    # 3. 如请求包含查询字符串（QUERY_STRING），则在CanonicalizedResource字符串尾部添加“？”和查询字符串。
-    def canonicalized_resource(logstorename, query={})
-      u = logstorename ? Addressable::URI.parse("/logstores/#{logstorename}") : Addressable::URI.parse("/logstores")
-      if query.size != 0
-        # 不能对请求的URL参数做URLEncode编码
-        q_str = query.keys.sort.map { |e|
-          "#{e}=#{query[e]}"
-        }.join('&')
-        "#{u}?#{q_str}"
-      else
-        u.to_s
-      end
-    end
-
-    # 目前，SLS API只支持一种数字签名算法，即默认签名算法"hmac-sha1"。其整个签名公式如下：
-    # Signature = base64(hmac-sha1(UTF8-Encoding-Of(SignString)，AccessKeySecret))
-    def sign(method, logstorename, headers, content, query)
-      Base64.encode64((HMAC::SHA1.new(@aliyun_access_key_secret) << string_to_sign(method, logstorename, headers, content, query).chomp).digest).strip
-    end
-
-    def signature(method, logstorename, headers, content, query)
-      "SLS #{@aliyun_access_key_id}:#{sign(method, logstorename, headers, content, query)}"
-    end
-
-    # https://help.aliyun.com/document_detail/29010.html
-    def setup_common_headers()
-
-    end
-
-    # content是LogGroup
-    def compact_headers(content, compressed)
-      headers = @headers.dup
-      # headers["x-sls-date"] =
-      headers["Date"] = DateTime.now.httpdate
-      headers["x-sls-bodyrawsize"] = "0"
-
-      if content and compressed
-        body = content.encode.to_s
-        headers["Content-Length"] = compressed.bytesize.to_s
-        # 日志内容包含的日志必须小于3MB和4096条。
-        raise AliyunSls::PostBodyTooLarge, "content length is larger than 3MB" if headers["Content-Length"].to_i > 3*1024**2*8
-#        raise AliyunSls::PostBodyTooLarge, "content size is more than 4096" if content.logs && content.logs.size > 4096
-        # MD5必须为大写字符串
-        headers["Content-MD5"] = Digest::MD5.hexdigest(compressed).upcase
-        headers["Content-Type"] = "application/json"
-        headers["x-sls-bodyrawsize"] = body.bytesize.to_s
-        headers["x-sls-compresstype"] = "deflate"
-      end
-      headers
-    end
-
-    def parse_response(response)
-      # 如果返回结果报错，则解析报错内容打印到日志中
-      if response.code.to_s =~ /[4|5]\d\d/
-        msg = "status #{response.code} body #{response.body}"
-        if $logger and $logger.respond_to?(:error)
-          $logger.error msg
-        else
-          puts msg
-        end
-      end
-      response
-    end
-  end
-end