aliyun-log 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c29e47df03c69ea213e48e43e272714f950887b5ab8efaa60321e4506b4d4bd
-  data.tar.gz: fd5dcd273e40f70f93bd69e1fc9dbc392171d90c9881650503c420b18cf0cd5d
+  metadata.gz: ba1bcbd83277ca8da27978ecd7a603a205a19c1600b11f359135e2629e6f61c4
+  data.tar.gz: d1e731f6b181167ef11004c7c79bbbef9acd290be531a08a24bb6f87134cfaac
 SHA512:
-  metadata.gz: 6a4a990ac42f07d0ce44fe018604a5af553f5d53a74cdb0b3abfd9a6b15f891f434bc3fada83afdae815c3bbf5477d72be9520f6926609ec356fe9aa8b6098d5
-  data.tar.gz: 0addf200ac1e5328fd5fbd4a459cf756a52f0b8ad1bc53f775676340147af385dc8758da2b7b0d63c8285b409820e4ab8778a822d0505172d554e12865ad7567
+  metadata.gz: 850989116e4820287e15fbe5361319f1043d4a1c3e7991bab947187bcac2d0114ee9244df26c4c132cd29d400752b4f18a6c0a3bcccaaabdda151858829b19e4
+  data.tar.gz: c03afaddd81499c4cb36be357d9894eccf2574fa009afa2d57f7d01e61885534a60b94f4bc2dfaa315e5db0862481225966fc71f27fb8ce1d6a1686284f90e40

data/lib/aliyun/log/record/persistence.rb

@@ -100,6 +100,7 @@ module Aliyun
             raw_conf = JSON.parse(conf_res)
             index_conf = raw_conf.deep_dup
             field_index_types.each do |k, v|
+              index_conf['keys'] ||= {}
               index_conf['keys'][k.to_s] ||= {}
               index_conf['keys'][k.to_s].merge!(v.as_json)
             end

data/lib/aliyun/log/record/relation.rb

@@ -162,11 +162,15 @@ module Aliyun
         end
 
         def count
-          # @opts[:select] = 'COUNT(*) as count'
-          _sql = to_sql
-          sql = "SELECT COUNT(*) as count"
-          sql += " FROM(#{_sql})" if _sql.present?
           query = @opts.dup
+          if query[:select].blank?
+            @opts[:select] = 'COUNT(*) as count'
+            sql = to_sql
+          else
+            _sql = to_sql
+            sql = "SELECT COUNT(*) as count"
+            sql += " FROM(#{_sql})" if _sql.present?
+          end
           query[:query] = "#{query[:search] || '*'}|#{sql}"
           res = execute(query)
           res.dig(0, 'count').to_i
@@ -204,6 +208,7 @@ module Aliyun
         end
 
         def to_sql
+          return @opts[:sql] if @opts[:sql].present?
           opts = @opts.dup
           sql_query = []
           sql_query << "WHERE #{opts[:where]}" if opts[:where].present?

data/lib/aliyun/log/request.rb

@@ -7,6 +7,8 @@ require 'digest'
 require 'date'
 require 'zlib'
 
+require_relative 'utils'
+
 module Aliyun
   module Log
     class Request
@@ -16,25 +18,6 @@ module Aliyun
         @config = config
       end
 
-      def get_resource_path(resources = {})
-        resources ||= {}
-        res = '/'
-        if resources[:logstore]
-          res = "#{res}logstores"
-          res = "#{res}/#{resources[:logstore]}" unless resources[:logstore].empty?
-        end
-        res = "#{res}/#{resources[:action]}" if resources[:action]
-        res
-      end
-
-      def get_request_url(resources = {})
-        resources ||= {}
-        url = URI.parse(@config.endpoint)
-        url.host = "#{resources[:project]}." + url.host if resources[:project]
-        url.path = get_resource_path(resources)
-        url.to_s
-      end
-
       def get(resources, payload = {})
         do_request('GET', resources, payload)
       end
@@ -52,10 +35,11 @@ module Aliyun
       end
 
       def do_request(verb, resources, payload)
-        resource_path = get_resource_path(resources)
+        resource_path = Utils.get_resource_path(resources)
+        url = Utils.get_request_url(@config.endpoint, resources)
         request_options = {
           method: verb,
-          url: get_request_url(resources),
+          url: url,
           open_timeout: @config.open_timeout,
           read_timeout: @config.read_timeout
         }
@@ -75,15 +59,17 @@ module Aliyun
         response = request.execute do |resp|
           if resp.code >= 300
             e = ServerError.new(resp)
-            logger.error(e.to_s)
+            logger.error("#{e.to_s} #{resp.code} #{resp}")
             raise e
           else
             resp.return!
           end
         end
 
-        logger.debug("Received HTTP response, code: #{response.code}, headers: " \
-                      "#{response.headers}, body: #{response.body.force_encoding('UTF-8')}")
+        logger.debug("Received HTTP response, code: #{response.code}, " \
+                      "url: #{request_options[:url]}, " \
+                      "method: #{verb}, headers: #{response.headers}, " \
+                      "body: #{response.body.force_encoding('UTF-8')}")
 
         response
       end

data/lib/aliyun/log/utils.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext'
+
+module Aliyun
+  module Log
+  	module Utils
+	  	module_function
+	  	def get_resource_path(resources = {})
+	      resources ||= {}
+	      res = '/'
+	      if resources[:logstore]
+	        res = "#{res}logstores"
+	        res = "#{res}/#{resources[:logstore]}" unless resources[:logstore].empty?
+	      end
+	      res = "#{res}/#{resources[:action]}" if resources[:action]
+	      res
+	    end
+
+	    def get_request_url(endpoint, resources = {})
+	      resources ||= {}
+	      url = URI.parse(endpoint)
+	      url.host = "#{resources[:project]}." + url.host if resources[:project]
+	      url.path = get_resource_path(resources)
+	      url.to_s
+	    end
+	  end
+  end
+end

data/lib/aliyun/version.rb

@@ -2,6 +2,6 @@
 
 module Aliyun
   module Log
-    VERSION = '0.2.11'
+    VERSION = '0.2.12'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aliyun-log
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Yingce Liu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -114,6 +114,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Aliyun Log SDK for Ruby 阿里云日志服务(SLS) Ruby SDK, 目前仅实现基于Restfull部分接口和简单Model映射
 email:
 - yingce@live.com
@@ -128,7 +142,6 @@ files:
 - lib/aliyun/log/common/logging.rb
 - lib/aliyun/log/config.rb
 - lib/aliyun/log/logstore.rb
-- lib/aliyun/log/logtail.rb
 - lib/aliyun/log/project.rb
 - lib/aliyun/log/protobuf.rb
 - lib/aliyun/log/protocol.rb
@@ -142,6 +155,7 @@ files:
 - lib/aliyun/log/record/type_casting.rb
 - lib/aliyun/log/request.rb
 - lib/aliyun/log/server_error.rb
+- lib/aliyun/log/utils.rb
 - lib/aliyun/version.rb
 homepage: https://github.com/yingce/aliyun-log
 licenses:

data/lib/aliyun/log/logtail.rb

@@ -1,13 +0,0 @@
-module Aliyun
-	module Log
-		class LogTail < Common::AttrStruct
-			attrs :name, :log_type, :log_path, :file_pattern, :localstore, :time_format,
-						:log_begin_regex, :regex, :key, :topic_format,
-						:filterKey, :filter_regex, :file_encoding
-      def initialize(opts, protocol)
-        super(opts)
-        @protocol = protocol
-      end
-		end
-	end
-end