pgbouncerhero 0.1.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 827a3a4bfea83fcb9b95692c6401847a453a59e2
-  data.tar.gz: 803feac4e01686ff104e1a55cd2c176d5d366907
+  metadata.gz: e99b6949ad102047e0cbef15d498da34637d2fd5
+  data.tar.gz: c6e4afdfbdec05be13c7f1a19212458ebf3d9f31
 SHA512:
-  metadata.gz: 9d47db11b462287b0b5ba8c9f4c42c1b4bf3cd04d46b2c0d28cff8cae6b28d4546667bc10f83d2de9193cd14c11ec976a661da53da8955d3fb620b7e0dfc42ab
-  data.tar.gz: a096b7a22b57c9682af5a4ed4523618a616165409c6cd3416987e8dd94626c504378b7baeed0485f53be97b3fc56c939d95b88fc22679f3fcb74b191bb614f68
+  metadata.gz: d8226446112e91797a812d689d80fa10c4dbb83c54e36d7229d97cd7401de49c2f9894bf88f68c16d2fa8eef298f6060b16296356919f9058c26bea6782c60a9
+  data.tar.gz: ba8b50b569a64fbb6b58be2ba80239c341b064f18f56f82a67b0d9b0ff2edf4e4bd984a130915d8bcbc4af1f02b35d3ab79e7ab938d885add176d052c18b8ab3

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.0.0
+
+- Lazy connection for index
+- Bug fixes
+
 ## 0.1.0
 
 - First major release

data/app/views/pg_bouncer_hero/database/summary.js.haml

@@ -1,3 +1,5 @@
+$("#segment_status_#{@database.group.name.parameterize}_#{@database.name.parameterize}").html("#{j(@database.connection ? "Online" : "Offline")}")
+$("#segment_status_#{@database.group.name.parameterize}_#{@database.name.parameterize}").removeClass("grey negative positive").addClass("#{j(@database.connection ? "positive" : "negative")}")
 $("#segment_content_#{@database.group.name.parameterize}_#{@database.name.parameterize}").replaceWith("#{j(render partial: 'pg_bouncer_hero/home/card_content', locals: {database: @database, id: "segment_content_#{@database.group.name.parameterize}_#{@database.name.parameterize}"})}")
 $("#segment_refreshed_#{@database.group.name.parameterize}_#{@database.name.parameterize}").css('display', '')
 $("#segment_content_#{@database.group.name.parameterize}_#{@database.name.parameterize} .ui.progress").each(function(idx, el) { $(el).progress({ text: {active: '{value} of {total} connections'}, autoSuccess: false }); });

data/app/views/pg_bouncer_hero/home/_card.html.haml

@@ -1,4 +1,3 @@
-- connected = database.connection
 .eight.wide.column{id: "segment_href_#{database.group.name.parameterize}_#{database.name.parameterize}", data: {href: summary_path(group: database.group.name.parameterize, database: database.name.parameterize)}}
   = link_to databases_path(group: database.group.name.parameterize, database: database.name.parameterize), style: 'text-decoration: none !important; color: inherit !important' do
     .ui.segments{style: 'margin-bottom: 10px;'}
@@ -6,10 +5,9 @@
         %div{style: 'float: left;'}
           %div{style: 'font-size: 16px; font-weight: bold;'}= database.name
           %div{style: 'font-size: 12px; color: grey'}= database.host
-        %button.ui.button.basic.button{style: 'float: right;', class: connected ? 'positive': 'negative'}= connected ? 'Online' : 'Offline'
-      - if connected
-        = render partial: partial, locals: {database: database, id: "segment_content_#{database.group.name.parameterize}_#{database.name.parameterize}"}
-        .ui.segment{id: "segment_refreshed_#{database.group.name.parameterize}_#{database.name.parameterize}", style: 'height: 35px; display: none;'}
-          %span.right.floated{id: "segment_refreshed_span_#{database.group.name.parameterize}_#{database.name.parameterize}", style: 'float:right; margin-top: -6px; color: grey'}
-            Last refresh:
-            = Time.now.strftime("%H:%M:%S GMT%z (%Z)") # Same as new Date().toTimeString() in JS
+        %button.ui.button.basic.button{id: "segment_status_#{database.group.name.parameterize}_#{database.name.parameterize}", style: 'float: right;', class: 'grey'}= 'N/A'
+      = render partial: partial, locals: {database: database, id: "segment_content_#{database.group.name.parameterize}_#{database.name.parameterize}"}
+      .ui.segment{id: "segment_refreshed_#{database.group.name.parameterize}_#{database.name.parameterize}", style: 'height: 35px; display: none;'}
+        %span.right.floated{id: "segment_refreshed_span_#{database.group.name.parameterize}_#{database.name.parameterize}", style: 'float:right; margin-top: -6px; color: grey'}
+          Last refresh:
+          = Time.now.strftime("%H:%M:%S GMT%z (%Z)") # Same as new Date().toTimeString() in JS

data/app/views/pg_bouncer_hero/home/_card_content.html.haml

@@ -1,26 +1,28 @@
-.ui.horizontal.segments{id: id, style: 'background-color: white !important;'}
-  .ui.segment
-    - summary = database.summary
-    %div
-      %i.users.icon
-      - number = summary.select { |row| row['list'] == 'users' }.first['items']
-      = pluralize(number, 'user')
-    %div
-      %i.database.icon
-      - number = summary.select { |row| row['list'] == 'databases' }.first['items'].to_i - 1 # Removed pgbouncer
-      = pluralize(number, 'database')
-    %div
-      %i.plug.icon
-      - number = summary.select { |row| row['list'] == 'pools' }.first['items'].to_i - 1 # Removed pgbouncer
-      = pluralize(number, 'pool')
-  .ui.segment
-    %ul{style: 'margin: 0; padding-left: 5px;'}
-      - summary.select{ |row| row.key?(:databases_details) }.first[:databases_details].each do |db|
-        %li{style: 'margin: 0; list-style-type: none;'}
-          %span
-            %i.database.icon
-            %strong=db['name']
-            .ui.progress.small.success{data:{value: db['current_connections'], total: db['max_connections']}, style: 'float:right; width: 150px; margin-top:4px;'}
-              .bar
-                .progress
-              .label Connections
+- connected = database.connection
+- if connected
+  .ui.horizontal.segments{id: id, style: 'background-color: white !important;'}
+    .ui.segment
+      - summary = database.summary
+      %div
+        %i.users.icon
+        - number = summary.select { |row| row['list'] == 'users' }.first['items']
+        = pluralize(number, 'user')
+      %div
+        %i.database.icon
+        - number = summary.select { |row| row['list'] == 'databases' }.first['items'].to_i - 1 # Removed pgbouncer
+        = pluralize(number, 'database')
+      %div
+        %i.plug.icon
+        - number = summary.select { |row| row['list'] == 'pools' }.first['items'].to_i - 1 # Removed pgbouncer
+        = pluralize(number, 'pool')
+    .ui.segment
+      %ul{style: 'margin: 0; padding-left: 5px;'}
+        - summary.select{ |row| row.key?(:databases_details) }.first[:databases_details].each do |db|
+          %li{style: 'margin: 0; list-style-type: none;'}
+            %span
+              %i.database.icon
+              %strong=db['name']
+              .ui.progress.small.success{data:{value: db['current_connections'], total: db['max_connections']}, style: 'float:right; width: 150px; margin-top:4px;'}
+                .bar
+                  .progress
+                .label Connections

data/app/views/pg_bouncer_hero/home/index.html.haml

@@ -7,7 +7,7 @@
     .sixteen.wide.row
       .sixteen.wide.column
         %h3.ui.dividing.header{style: 'margin-bottom: 10px;'}= group.name
-      = render partial: "card", collection: group.databases, as: :database, locals: {partial: 'card_loading_content'}
+      = render partial: "card", collection: group.databases, as: :database, locals: {partial: 'card_loading_content', lazy: true}
 
 :javascript
   document.addEventListener("DOMContentLoaded", function(event) {
@@ -22,10 +22,13 @@
         var id = el.attr('id');
         var href = el.data('href');
         var refreshed_id = id.replace('href', 'refreshed_span');
-        document.getElementById(refreshed_id).innerHTML = 'Refreshing...';
-        $.get(href, function(data) {
-          document.getElementById(refreshed_id).innerHTML = 'Last refresh: ' + new Date().toTimeString();
-        });
+        var refreshed_div = document.getElementById(refreshed_id);
+        if (refreshed_div) {
+          refreshed_div.innerHTML = 'Refreshing...';
+          $.get(href, function(data) {
+            refreshed_div.innerHTML = 'Last refresh: ' + new Date().toTimeString();
+          });
+        }
       });
     }, 60 * 1000)
   });

data/lib/pgbouncerhero/connection.rb

@@ -7,6 +7,7 @@ module PgBouncerHero
       @user = user
       @password = password
       @dbname = dbname
+      @timeout = ENV["PGBOUNCERHERO_TIMEOUT"] || 5
     end
 
     def connection
@@ -18,10 +19,10 @@ module PgBouncerHero
             user: @user,
             password: @password,
             dbname: @dbname,
-            connect_timeout: 5
+            connect_timeout: @timeout
           )
-        rescue => e
-          Rails.logger.info(e)
+        rescue Exception => e
+          Rails.logger.error("[PGBouncerHero] Host:#{@host} | Database Name:#{@dbname} | Timeout: #{@timeout}s => #{e}")
           nil
         end
       end

data/lib/pgbouncerhero/methods/basics.rb

@@ -2,12 +2,14 @@ module PgBouncerHero
   module Methods
     module Basics
       def summary
-        l = lists
-        d = databases
-        l = l.as_json
-        d = d.as_json.reject { |a| a['name'] == 'pgbouncer' }
-        l.push({databases_details: d})
-        l
+        if connection
+          l = lists
+          d = databases
+          l = l.as_json
+          d = d.as_json.reject { |a| a['name'] == 'pgbouncer' }
+          l.push({databases_details: d})
+          l
+        end
       end
       def databases
         connection.exec("SHOW databases")

data/lib/pgbouncerhero/version.rb

@@ -1,3 +1,3 @@
 module PgBouncerHero
-  VERSION = "0.1.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgbouncerhero
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Quentin Rousseau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-15 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: A graphical user interface for your PGBouncers