detector 0.7.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803cfd73b761e5b098dac4d15062b3a47e768d70d862c61301f3e8444c011762
-  data.tar.gz: f96d8885689baed71e8dfd8aa986ee24a6b0620c2745ff91a60e541d9324b781
+  metadata.gz: 160f91ff5337a5e65db122754c58acf167ea6c92a2628b6c4cae37dfbebbd2e9
+  data.tar.gz: '0691d5918ca772909057ebf059947f4f1b08cd8b5388f0cc7836842d980bf677'
 SHA512:
-  metadata.gz: ec4621a88022efbac688c988275d21077dc260139a630659fef4f9257f4baa1409805add6f8056fe6c5a53b2329db849abc685839a5ace170b309089b9a909b3
-  data.tar.gz: ec584db3cb9ea42c2ce979c17cbc2d0facd7831d08105ab5ed1de0559c5ec5ca6e80fd32734851142ebb45eac676317fd8ac2f8fa72cd44eac41a5189c39bfe1
+  metadata.gz: a192f06a2497b21ac4475d2686615450eb800a888367a02eefb36dcf3ae5f7959712a49f4a33012aaa554fabd4d18390aac08e9671dddef38f6f4d8d97c9e561
+  data.tar.gz: f9426467573fae22f8fb192b342d376cc1fd04036079821c62c354f3dc0fe426417cdf34a8e3a18e7b09bda36ee2478176fcd1d70d2ac4c3642ea4b10aaa69e6

data/bin/detector

@@ -48,7 +48,10 @@ puts "Detected: #{detector.kind}"
 puts "Version: #{detector.version}"
 puts "Host: #{detector.host}:#{detector.port}"
 
-if detector.connection_count && detector.connection_limit
+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]})"
+elsif detector.connection_count && detector.connection_limit
   usage = detector.connection_usage_percentage
   puts "Connections: #{detector.connection_count}/#{detector.connection_limit} (#{usage}%)"
 end

data/lib/detector/addons/mariadb.rb

@@ -53,6 +53,27 @@ module Detector
         end
       end
       
+      def connection_info
+        return nil unless connection
+        begin
+          user_limit = connection.query("SELECT @@max_user_connections AS `limit`").first['limit'].to_i
+          user_count = connection.query("SELECT COUNT(*) AS count FROM information_schema.PROCESSLIST WHERE user = USER()").first['count'].to_i
+          global_limit = connection.query("SELECT @@max_connections AS `limit`").first['limit'].to_i
+          global_count = connection.query("SELECT COUNT(*) AS count FROM information_schema.PROCESSLIST").first['count'].to_i
+          
+          # If user limit is 0, it means no specific per-user limit (use global)
+          user_limit = global_limit if user_limit == 0
+          
+          {
+            connection_count: { user: user_count, global: global_count },
+            connection_limits: { user: user_limit, global: global_limit }
+          }
+        rescue => e
+          puts "Error getting connection info: #{e.message}"
+          nil
+        end
+      end
+      
       def tables(database_name)
         return [] unless connection
         

data/lib/detector/addons/mysql.rb

@@ -12,7 +12,8 @@ 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,
@@ -93,6 +94,26 @@ module Detector
         connection.query("SHOW VARIABLES LIKE 'max_connections'").first['Value'].to_i
       end
       
+      def connection_info
+        return nil unless connection
+        begin
+          user_limit = connection.query("SELECT @@max_user_connections AS `limit`").first['limit'].to_i
+          user_count = connection.query("SELECT COUNT(*) AS count FROM information_schema.PROCESSLIST WHERE user = USER()").first['count'].to_i
+          global_limit = connection.query("SELECT @@max_connections AS `limit`").first['limit'].to_i
+          global_count = connection.query("SELECT COUNT(*) AS count FROM information_schema.PROCESSLIST").first['count'].to_i
+          
+          # If user limit is 0, it means no specific per-user limit (use global)
+          user_limit = global_limit if user_limit == 0
+          
+          {
+            connection_count: { user: user_count, global: global_count },
+            connection_limits: { user: user_limit, global: global_limit }
+          }
+        rescue => e
+          nil
+        end
+      end
+      
       def cli_name
         "mysql"
       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
@@ -146,6 +147,28 @@ module Detector
         connection.exec("SELECT current_setting('max_connections')").first['current_setting'].to_i
       end
       
+      def connection_info
+        return nil unless connection
+        begin
+          global_limit = connection.exec("SELECT current_setting('max_connections')").first['current_setting'].to_i
+          global_count = connection.exec("SELECT count(*) FROM pg_stat_activity").first['count'].to_i
+          
+          # For PostgreSQL user connections - depends on per-user limits if set
+          user_limit_result = connection.exec("SELECT rolconnlimit FROM pg_roles WHERE rolname = current_user").first
+          user_limit = user_limit_result['rolconnlimit'].to_i
+          user_limit = global_limit if user_limit <= 0 # If unlimited, use global limit
+          
+          user_count = connection.exec("SELECT count(*) FROM pg_stat_activity WHERE usename = current_user").first['count'].to_i
+          
+          {
+            connection_count: { user: user_count, global: global_count },
+            connection_limits: { user: user_limit, global: global_limit }
+          }
+        rescue => e
+          nil
+        end
+      end
+      
       def cli_name
         "psql"
       end

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
       
@@ -69,6 +68,22 @@ module Detector
         info['maxclients'].to_i rescue 0
       end
       
+      def connection_info
+        return nil unless info
+        begin
+          # Redis doesn't have per-user connection limits, so user = global
+          global_count = info['connected_clients'].to_i rescue 0
+          global_limit = info['maxclients'].to_i rescue 0
+          
+          {
+            connection_count: { user: global_count, global: global_count },
+            connection_limits: { user: global_limit, global: global_limit }
+          }
+        rescue => e
+          nil
+        end
+      end
+      
       def cli_name
         "redis-cli"
       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?
@@ -233,6 +248,15 @@ module Detector
       (connection_count.to_f / connection_limit.to_f * 100).round(1)
     end
     
+    def connection_info
+      # Default implementation for databases without user-specific limits
+      return nil unless connection_count && connection_limit
+      {
+        connection_count: { user: connection_count, global: connection_count },
+        connection_limits: { user: connection_limit, global: connection_limit }
+      }
+    end
+    
     def estimated_row_count(table:, database: nil)
       nil
     end

data/lib/detector/version.rb

@@ -1,3 +1,3 @@
 module Detector
-  VERSION = "0.7.0"
+  VERSION = "0.8.1"
 end 

metadata

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