perus 0.1.13 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba6a606d7b4de0dc9c1de7acf3f77b504ecc8e2
-  data.tar.gz: ecfc89824684d7340e5dcad9c5a4c37c74f2242b
+  metadata.gz: 3df40bd6deb3e165e357bb4227dbe0b834d33bf5
+  data.tar.gz: 4c31499544a9d3e97bd3fb7e99308df0cbe4776f
 SHA512:
-  metadata.gz: 5e0216550de7327f01a58a25facde55802f166532cd894930fdf422ca20eef908709f13e4952906cc9dc4994cc3f6054b38ce6d0332d7301572dbb2b2a682348
-  data.tar.gz: bfe4830fbfe10f75c71fab1537a03d49ec52668f5e0b91bb74337c5bc8533e474622bf0bbdf472b1700f1fb596aee2d7dee129be64369305ff4f0e1de94a4dad
+  metadata.gz: 44f0105e7f52fb732e0effef6635ba31150af32db4daecee4e2e54b9618e2bec66c4ebd94a9854a32de21154b0b83342b54133698165ee0401e061482c28b56d
+  data.tar.gz: e08dce48e0555f801f3646b67de6489a0f44024409440e2f7a0bae229de4a7a304b644988104a2049fde254e3415948e123fb775442ab7d6041f867e746769c4

data/lib/perus/server/app.rb

@@ -104,6 +104,7 @@ module Perus::Server
 
         get '/admin/stats' do
             @stats = Stats.new
+            @queue_length = Server.ping_queue.length
             erb :stats
         end
 
@@ -147,31 +148,30 @@ module Perus::Server
 
         # receive data from a client
         post '/systems/:id/ping' do
-            Server.ping_queue.post do
-                timestamp = Time.now.to_i
+            timestamp = Time.now.to_i
+            ping_params = params.dup
 
+            if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
+                system_ip = request.env['HTTP_X_FORWARDED_FOR']
+            else
+                system_ip = request.ip
+            end
+
+            Server.ping_queue << Proc.new do
                 # update the system with its last known ip and update time
-                system = System.with_pk!(params['id'])
+                system = System.with_pk!(ping_params['id'])
                 system.last_updated = timestamp
-
-                if request.ip == '127.0.0.1' && ENV['RACK_ENV'] == 'production'
-                    system.ip = request.env['HTTP_X_FORWARDED_FOR']
-                else
-                    system.ip = request.ip
-                end
+                system.ip = system_ip
+                system.save
 
                 # errors is either nil or a hash of the format - module: [err, ...]
-                system.save_metric_errors(params, timestamp)
+                system.save_metric_errors(ping_params, timestamp)
 
                 # add each new value, a later process cleans up old values
-                system.save_values(params, timestamp)
+                system.save_values(ping_params, timestamp)
 
                 # save action return values and prevent them from running again
-                system.save_actions(params, timestamp)
-
-                # ip, last updated, uploads and metrics are now updated. these are
-                # stored on the system.
-                system.save
+                system.save_actions(ping_params, timestamp)
             end
 
             content_type :json

data/lib/perus/server/db.rb

@@ -5,6 +5,7 @@ require 'concurrent'
 module Perus::Server
     module DB
         MAX_VACUUM_ATTEMPTS = 5
+        MAX_CLEAN_ATTEMPTS = 5
 
         def self.db
             @db
@@ -80,11 +81,29 @@ module Perus::Server
             # are removed from a system, the accompanying metric record is also
             # removed.
             cleanup_task = Concurrent::TimerTask.new do
-                begin
-                    start = Time.now
-                    Perus::Server::DB.cleanup
-                    Stats.cleaned!(Time.now - start)
-                rescue
+                attempts = 0
+                complete = false
+
+                while !complete && attempts < MAX_CLEAN_ATTEMPTS
+                    begin
+                        puts "Cleaning, attempt #{attempts + 1}"
+                        start = Time.now
+                        Perus::Server::DB.cleanup
+                        Stats.cleaned!(Time.now - start)
+                        complete = true
+                        puts "Cleaning complete"
+                        
+                    rescue
+                        attempts += 1
+                        if attempts < MAX_CLEAN_ATTEMPTS
+                            puts "Clean failed, will reattempt after short sleep"
+                            sleep(5)
+                        end
+                    end
+                end
+
+                if !complete
+                    puts "Clean failed more than MAX_CLEAN_ATTEMPTS"
                     Stats.cleaned!('failed')
                 end
             end
@@ -98,12 +117,14 @@ module Perus::Server
             # cached so lookups can be done against the db, rather than running
             # each alert for each system on a page load.
             cache_alerts_task = Concurrent::TimerTask.new do
-                begin
-                    start = Time.now
-                    Perus::Server::Alert.cache_active_alerts
-                    Stats.alerts_cached!(Time.now - start)
-                rescue
-                    Stats.alerts_cached!('failed')
+                if Server.ping_queue.empty?
+                    begin
+                        start = Time.now
+                        Perus::Server::Alert.cache_active_alerts
+                        Stats.alerts_cached!(Time.now - start)
+                    rescue
+                        Stats.alerts_cached!('failed')
+                    end
                 end
             end
 

data/lib/perus/server/migrations/001_create_systems.rb

@@ -9,7 +9,6 @@ Sequel.migration do
             Integer :config_id
             String  :links, text: true
             String  :ip
-            String  :metrics, text: true
             Integer :last_updated
         end
     end

data/lib/perus/server/public/css/style.css

@@ -509,6 +509,7 @@ article.graph {
     }
 
 #actions-menu {
+    padding-bottom: 50px;
 }
 
     #actions-menu p {

data/lib/perus/server/server.rb

@@ -1,4 +1,4 @@
-require 'concurrent'
+require 'thread'
 require 'thin'
 
 DEFAULT_SERVER_OPTIONS = {
@@ -25,6 +25,21 @@ module Perus::Server
             # initialise/migrate the db and start cleanup/caching timers
             DB.start
             DB.start_timers
+
+            # ping data is processed in a thread pool
+            Thread.new do
+                while true
+                    ping = Server.ping_queue.pop
+                    begin
+                        ping.call
+                    rescue => e
+                        puts e.inspect
+                        if e.backtrace.is_a?(Array)
+                            puts e.backtrace.join("\n") + "\n"
+                        end
+                    end
+                end
+            end
         end
 
         def run
@@ -36,16 +51,7 @@ module Perus::Server
         end
 
         def self.ping_queue
-            # ping data is processed in a thread pool
-            @ping_queue ||= Concurrent::ThreadPoolExecutor.new(
-                min_threads: 2,
-                max_threads: 2,
-                max_queue: 0
-            )
-        end
-
-        def self.shutdown
-            @ping_queue.shutdown
+            @ping_queue ||= Queue.new
         end
 
         def self.options

data/lib/perus/server/views/stats.erb

@@ -1,5 +1,7 @@
 <h1>Background Stats</h1>
 
+<p>Ping queue length: <%= @queue_length %></p>
+
 <h2 class="stats">Vacuuming</h2>
 <dl>
     <dt>Last Vacuum</dt>

data/lib/perus/version.rb

@@ -1,3 +1,3 @@
 module Perus
-    VERSION = "0.1.13"
+    VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors:
 - Will Cannings