detector 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d21e960cc4220b3bf67a98d0ce5ef7f367710545173ff09cfcee580cc3895e64
-  data.tar.gz: dba6d148d06ea37444017539b0bb23fd43cb96c9deeedf6235fc8e5cfe3999b7
+  metadata.gz: c1005a81a12b0ba3854590f05209d1c420a32fa1a01ff6e12b6ce8e8d98aebc9
+  data.tar.gz: 071f0840a62f62af205f42e2fc314e5a0b02a202f229d7aaa91b89deb2b29ea8
 SHA512:
-  metadata.gz: 19732b310f2f739e03c478103ebb1de34979145fd867d5beab4c82d8ef14c6405c7b4d9bac18849b79adba3dfc9e0e25c4dd0fcada4d6321e95a0822a9cc3efc
-  data.tar.gz: 318344d8e1f23196e5fe2eef8435aec32729fe488d41b0277bcf567117df1f3dbe105269777310a51344aba2453565adc1506c014d1c972a33b02c8f32d1afe5
+  metadata.gz: 77b605d95e6ba1f5aab74d2060121b28bd44ee6057e4d6ceecf153e79065d7287a17e0b9e046cb24f7e056a4af53d445b757b02fc7a20e0be1eb1f7039206178
+  data.tar.gz: 05d528909480534ded0b1ce8b89aad390465e53713b8a8e8e5895d8a282a2bc7dc503ec1e3a82fc2aff4a203e0e71dfe6143b4fee4d8914b377b65d4ea427593

data/bin/detector

@@ -50,7 +50,11 @@ puts "Host: #{detector.host}:#{detector.port}"
 
 if detector.respond_to?(:connection_info) && detector.connection_info
   conn_info = detector.connection_info
-  puts "Connections: global #{conn_info[:connection_count][:global]}/#{conn_info[:connection_limits][:global]} (user #{conn_info[:connection_count][:user]}/#{conn_info[:connection_limits][:user]})"
+  if conn_info[:error]
+    puts "Connections: #{conn_info[:error]}"
+  else
+    puts "Connections: global #{conn_info[:connection_count][:global]}/#{conn_info[:connection_limits][:global]} (user #{conn_info[:connection_count][:user]}/#{conn_info[:connection_limits][:user]})"
+  end
 elsif detector.connection_count && detector.connection_limit
   usage = detector.connection_usage_percentage
   puts "Connections: #{detector.connection_count}/#{detector.connection_limit} (#{usage}%)"

data/lib/detector/addons/mariadb.rb

@@ -68,6 +68,17 @@ module Detector
             connection_count: { user: user_count, global: global_count },
             connection_limits: { user: user_limit, global: global_limit }
           }
+        rescue Mysql2::Error => e
+          if e.error_number == 1226 # User has exceeded max_user_connections
+            {
+              connection_count: { user: "LIMIT EXCEEDED", global: "N/A" },
+              connection_limits: { user: "EXCEEDED", global: "N/A" },
+              error: "Error: User has exceeded max_user_connections limit"
+            }
+          else
+            puts "Error getting connection info: #{e.message}"
+            nil
+          end
         rescue => e
           puts "Error getting connection info: #{e.message}"
           nil

data/lib/detector/addons/mysql.rb

@@ -12,12 +12,17 @@ module Detector
       end
     
       def connection
-        @conn ||= Mysql2::Client.new(
+        # Create a new connection each time without caching
+        Mysql2::Client.new(
           host: host,
           username: uri.user,
           password: uri.password,
           database: uri.path[1..-1],
-          port: port
+          port: port,
+          connect_timeout: 5,
+          read_timeout: 10,
+          write_timeout: 10,
+          init_command: "SET wait_timeout=900; SET interactive_timeout=900;"
         ) rescue nil
       end
       
@@ -108,6 +113,16 @@ module Detector
             connection_count: { user: user_count, global: global_count },
             connection_limits: { user: user_limit, global: global_limit }
           }
+        rescue Mysql2::Error => e
+          if e.error_number == 1226 # User has exceeded max_user_connections
+            {
+              connection_count: { user: "LIMIT EXCEEDED", global: "N/A" },
+              connection_limits: { user: "EXCEEDED", global: "N/A" },
+              error: "Error: User has exceeded max_user_connections limit"
+            }
+          else
+            nil
+          end
         rescue => e
           nil
         end

data/lib/detector/addons/postgres.rb

@@ -12,7 +12,8 @@ module Detector
       end
     
       def connection
-        @conn ||= PG::Connection.new(uri) rescue nil
+        # Create a new connection each time without caching
+        PG::Connection.new(uri) rescue nil
       end
       
       def version

data/lib/detector/addons/redis.rb

@@ -13,12 +13,11 @@ module Detector
       end
     
       def connection
-        return @conn if @conn
-        
+        # Create a new connection each time without caching
         if uri.scheme == 'rediss'
-          @conn = ::Redis.new(url: @url, port: uri.port, timeout: 5.0, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }) rescue nil
+          ::Redis.new(url: @url, port: uri.port, timeout: 5.0, ssl_params: { verify_mode: OpenSSL::SSL::VERIFY_NONE }) rescue nil
         else
-          @conn = ::Redis.new(url: @url, timeout: 5.0) rescue nil
+          ::Redis.new(url: @url, timeout: 5.0) rescue nil
         end
       end
       

data/lib/detector/addons/smtp.rb

@@ -12,13 +12,12 @@ module Detector
       end
     
       def connection
-        return @conn if @conn
-        
+        # Create a new connection each time without caching
         begin
-          @conn = Net::SMTP.new(host, port)
-          @conn.open_timeout = 5
-          @conn.start('detector.local', uri.user, uri.password, :login)
-          @conn
+          conn = Net::SMTP.new(host, port)
+          conn.open_timeout = 5
+          conn.start('detector.local', uri.user, uri.password, :login)
+          conn
         rescue => e
           nil
         end

data/lib/detector/base.rb

@@ -123,9 +123,24 @@ module Detector
     end
     
     def connection
+      # Default implementation returns nil
+      # Each addon should implement its own connection method
+      # that creates a new connection for each request
       nil
     end
     
+    def with_connection
+      conn = connection
+      return yield(nil) unless conn
+      
+      begin
+        result = yield(conn)
+        return result
+      ensure
+        close
+      end
+    end
+    
     def ping
       return nil unless valid?
       transport?

data/lib/detector/version.rb

@@ -1,3 +1,3 @@
 module Detector
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: detector
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Jonathan Siegel