aliyun-log 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0af7f849c9e5e9e6d59647f4b184c994977407f5b970f5d867505062401621c7
-  data.tar.gz: bfd3fafdac4839ac11d428638d44d15a4126d283195ddd6e5b033238f3e7b034
+  metadata.gz: 56b9e06d07673323179dae69adadfc8a6dc8518800181af620b31dfe13e5d11d
+  data.tar.gz: 6d17a1f90049d299362b5fa8961b5a2befa56b93e12a07b4fb15fb65bdc914f0
 SHA512:
-  metadata.gz: 033ae7fd59ab6e49b40c071942f289623226ca9a506f88cec0eafdce2edabcc56c5b2daecd7f7c8a6e27df39c11ebf62deab06c3d11b175c4b1f7eeef5284f5f
-  data.tar.gz: f31dc59e00955ecc7b0f6682356005b7ea2b872527818ea352418a99ddd81a8d3b0fd4d66f7fbda9c92073d9e8d51eca38b7af11364f2bf2d359ad565ac0299b
+  metadata.gz: 265b850b91106ed251fbc1deda94b4f9138f4c055e703be864b99cbb156e3a90583d6da29b5f15e3a4210fd75e89470b7d5281d52573b6a0dd4d8ec6613006cb
+  data.tar.gz: 7aca9990743677faa1863a34f2ce75bf66c357f6f177f8330de45a58ae7280ebaf6411856746b7566c64519f579ae37f5ef4e0ebd52253cf4a222ae348e90e07

data/lib/aliyun/log.rb

@@ -1,4 +1,5 @@
-# 
+# frozen_string_literal: true
+
 require_relative 'log/common'
 require_relative 'log/client'
 require_relative 'log/config'

data/lib/aliyun/log/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aliyun
   module Log
     class Client
@@ -10,6 +12,10 @@ module Aliyun
         @protocol.list_projects(size, offset)
       end
 
+      def projects(size = nil, offset = nil)
+        @protocol.projects(size, offset)
+      end
+
       def get_project(name)
         @protocol.get_project(name)
       end

data/lib/aliyun/log/common.rb

@@ -1,3 +1,4 @@
-# 
+# frozen_string_literal: true
+
 require_relative 'common/attr_struct'
 require_relative 'common/logging'

data/lib/aliyun/log/common/attr_struct.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aliyun
   module Log
     module Common

data/lib/aliyun/log/common/logging.rb

@@ -1,11 +1,11 @@
+# frozen_string_literal: true
+
 require 'logger'
 
 module Aliyun
   module Log
     module Common
       module Logging
-        # DEFAULT_LOG_FILE = './log/aliyun_log.log'.freeze
-        DEFAULT_LOG_FILE = STDOUT
         MAX_NUM_LOG = 100
         ROTATE_SIZE = 10 * 1024 * 1024
 
@@ -15,15 +15,32 @@ module Aliyun
 
         # level = Logger::DEBUG | Logger::INFO | Logger::ERROR | Logger::FATAL
         def self.log_level=(level)
+          @logger_level = level
           Logging.logger.level = level
         end
 
+        def self.logger=(logger)
+          @logger = logger
+        end
+
+        def self.log_file=(log_file)
+          @logger = Logger.new(
+            log_file, MAX_NUM_LOG, ROTATE_SIZE
+          )
+          @logger.level = Logging.logger_level
+        end
+
+        def self.logger_level
+          @logger_level ||= Config.log_level
+          @logger_level
+        end
+
         def self.logger
           unless @logger
             @logger = Logger.new(
-              @log_file ||= DEFAULT_LOG_FILE, MAX_NUM_LOG, ROTATE_SIZE
+              @log_file ||= Config.log_file, MAX_NUM_LOG, ROTATE_SIZE
             )
-            @logger.level = Logger::DEBUG
+            @logger.level = Logging.logger_level
           end
           @logger
         end

data/lib/aliyun/log/config.rb

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
+require 'logger'
 module Aliyun
   module Log
     class Config < Common::AttrStruct
       @endpoint = 'https://cn-beijing.log.aliyuncs.com'
       @open_timeout = 10
       @read_timeout = 120
+      @log_file = 'aliyun_log.log'
+      @log_level = Logger::DEBUG
       class << self
         attr_accessor :endpoint, :access_key_id, :access_key_secret,
-                      :open_timeout, :read_timeout
+                      :open_timeout, :read_timeout, :log_file, :log_level
 
         def configure
           yield self
@@ -28,16 +33,14 @@ module Aliyun
 
       private
 
-        def normalize_endpoint
-          uri = URI.parse(endpoint)
-          uri = URI.parse("http://#{endpoint}") unless uri.scheme
+      def normalize_endpoint
+        uri = URI.parse(endpoint)
+        uri = URI.parse("http://#{endpoint}") unless uri.scheme
 
-          if (uri.scheme != 'http') && (uri.scheme != 'https')
-            raise 'Only HTTP and HTTPS endpoint are accepted.'
-          end
+        raise 'Only HTTP and HTTPS endpoint are accepted.' if (uri.scheme != 'http') && (uri.scheme != 'https')
 
-          @endpoint = uri.to_s
-        end
+        @endpoint = uri.to_s
+      end
     end
   end
 end

data/lib/aliyun/log/logstore.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Aliyun
   module Log
     class Logstore < Common::AttrStruct
-
       attrs :name, :project_name, :ttl, :shared_count, :enable_tracking,
             :auto_split, :max_split_shard, :create_time, :last_modify_time
 

data/lib/aliyun/log/project.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aliyun
   module Log
     class Project < Common::AttrStruct

data/lib/aliyun/log/protobuf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'protobuf'
 
 module Aliyun

data/lib/aliyun/log/protocol.rb

@@ -5,6 +5,7 @@ require 'json'
 module Aliyun
   module Log
     class Protocol
+      include Common::Logging
       def initialize(config)
         @http = Request.new(config)
       end
@@ -22,6 +23,10 @@ module Aliyun
         data
       end
 
+      def projects(size = nil, offset = nil)
+        list_projects(size, offset)['projects']
+      end
+
       def get_project(project_name)
         query = { projectName: project_name }
         attrs = @http.get({ project: project_name }, query)
@@ -171,9 +176,7 @@ module Aliyun
         }
         fields.each do |k, v|
           body[:keys][k] = v
-          if %w[text json].include?(v[:type]) && v[:token].blank?
-            v[:token] = INDEX_DEFAULT_TOKEN
-          end
+          v[:token] = INDEX_DEFAULT_TOKEN if %w[text json].include?(v[:type]) && v[:token].blank?
         end
         @http.post({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)
       end
@@ -187,9 +190,7 @@ module Aliyun
         }
         fields.each do |k, v|
           body[:keys][k] = v
-          if v[:type] == 'text' && v[:token].blank?
-            v[:token] = INDEX_DEFAULT_TOKEN
-          end
+          v[:token] = INDEX_DEFAULT_TOKEN if v[:type] == 'text' && v[:token].blank?
         end
         @http.put({ project: project_name, logstore: logstore_name, action: 'index' }, body.to_json)
       end

data/lib/aliyun/log/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rest-client'
 require 'base64'
 require 'openssl'
@@ -72,7 +74,6 @@ module Aliyun
           payload = Zlib::Deflate.deflate(payload.encode) if resources[:is_pb]
           request_options[:payload] = payload
         end
-        logger.debug(request_options)
         request = RestClient::Request.new(request_options)
         response = request.execute do |resp|
           if resp.code >= 300
@@ -99,11 +100,13 @@ module Aliyun
           'User-Agent' => "aliyun-log ruby-#{RUBY_VERSION}/#{RUBY_PLATFORM}"
         }
         return headers if body.nil?
+
         if is_pb
           compressed = Zlib::Deflate.deflate(body.encode)
           headers['Content-Length'] = compressed.bytesize.to_s
           # 日志内容包含的日志必须小于3MB和4096条。
-          raise 'content length is larger than 3MB' if headers['Content-Length'].to_i > 3145728
+          raise 'content length is larger than 3MB' if headers['Content-Length'].to_i > 3_145_728
+
           headers['Content-MD5'] = Digest::MD5.hexdigest(compressed).upcase
           headers['Content-Type'] = 'application/x-protobuf'
           headers['x-log-compresstype'] = 'deflate'
@@ -122,7 +125,6 @@ module Aliyun
           @config.access_key_secret,
           string_to_sign(verb, resource, headers, query).chomp
         )
-        logger.debug "\n#{string_to_sign(verb, resource, headers, query).chomp}"
         base64_sign = Base64.strict_encode64(sha1_digest)
         "LOG #{@config.access_key_id}:#{base64_sign}"
       end
@@ -133,12 +135,12 @@ module Aliyun
           #{headers['Content-MD5']}
           #{headers['Content-Type']}
           #{headers['Date']}
-          #{canonicalized_sls_headers(headers)}
+          #{canonicalized_headers(headers)}
           #{canonicalized_resource(resource, query)}
         DOC
       end
 
-      def canonicalized_sls_headers(headers)
+      def canonicalized_headers(headers)
         h = {}
         headers.each do |k, v|
           h[k.downcase] = v if k =~ /x-log-.*/
@@ -151,11 +153,12 @@ module Aliyun
 
       def canonicalized_resource(resource = '', query = {})
         return resource if query.empty?
+
         url = URI.parse(resource)
-        q_str = query.keys.sort.map do |e|
+        sort_str = query.keys.sort.map do |e|
           "#{e}=#{query[e]}"
         end.join('&')
-        "#{url}?#{q_str}"
+        "#{url}?#{sort_str}"
       end
     end
   end

data/lib/aliyun/log/server_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Aliyun

data/lib/aliyun/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Aliyun
   module Log
-    VERSION = "0.1.0"
+    VERSION = '0.1.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-06-04 00:00:00.000000000 Z
+date: 2020-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
@@ -86,7 +86,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: Aliyun Log SDK for Ruby
+description: Aliyun Log SDK for Ruby 阿里云日志服务(SLS) Ruby SDK, 目前仅实现基于Restfull部分接口
 email:
 - yingce@live.com
 executables: []