perus 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df40bd6deb3e165e357bb4227dbe0b834d33bf5
-  data.tar.gz: 4c31499544a9d3e97bd3fb7e99308df0cbe4776f
+  metadata.gz: 733c49d83f2675c9e1a47508ca3694f14a946803
+  data.tar.gz: 93067c4ab61180c3fc09ef70cf1315be28e5eab4
 SHA512:
-  metadata.gz: 44f0105e7f52fb732e0effef6635ba31150af32db4daecee4e2e54b9618e2bec66c4ebd94a9854a32de21154b0b83342b54133698165ee0401e061482c28b56d
-  data.tar.gz: e08dce48e0555f801f3646b67de6489a0f44024409440e2f7a0bae229de4a7a304b644988104a2049fde254e3415948e123fb775442ab7d6041f867e746769c4
+  metadata.gz: f396acf003664d9c11cb6d40aed7ad545f4a683e68895ee8c1a803350d8dc79d954f9d60bc2e282a32d0a10dc702f3a4dbacaf646c31a0815a3a86261336c6cb
+  data.tar.gz: db0c3585362f6226cb32a523271b980fe82f2932243c474eae216ddf4c522a4336fa09e5d3f3cf736030e9f9f5b44f82c3cd09751991fb44ddb449b7a08e369c

data/lib/perus/server/db.rb

@@ -17,7 +17,7 @@ module Perus::Server
             Sequel.extension :inflector
 
             # connect/create the database and run any new migrations
-            @db = Sequel.sqlite(Server.options.db_path, integer_booleans: true)
+            @db = Sequel.postgres('perus', host: 'localhost')
             Sequel::Migrator.run(@db, File.join(__dir__, 'migrations'))
 
             # load models - these rely on an existing db connection
@@ -39,43 +39,6 @@ module Perus::Server
         end
 
         def self.start_timers
-            # attempt to run vacuum twice a day. this is done to increase
-            # performance rather than reclaim unused space. as old values and
-            # metrics are deleted the data become very fragmented. vacuuming
-            # restructures the db so system records in the values index should
-            # be sequentially stored
-            vacuum_task = Concurrent::TimerTask.new do
-                attempts = 0
-                complete = false
-
-                while !complete && attempts < MAX_VACUUM_ATTEMPTS
-                    begin
-                        puts "Vacuuming, attempt #{attempts + 1}"
-                        start = Time.now
-                        @db.execute('vacuum')
-                        Stats.vacuumed!(Time.now - start)
-                        complete = true
-                        puts "Vacuuming complete"
-                        
-                    rescue
-                        attempts += 1
-                        if attempts < MAX_VACUUM_ATTEMPTS
-                            puts "Vacuum failed, will reattempt after short sleep"
-                            sleep(5)
-                        end
-                    end
-                end
-
-                if !complete
-                    puts "Vacuum failed more than MAX_VACUUM_ATTEMPTS"
-                    Stats.vacuumed!('failed')
-                end
-            end
-
-            # fire every 12 hours
-            vacuum_task.execution_interval = 60 * 60 * 12
-            vacuum_task.execute
-
             # a fixed number of hours of data are kept in the database. once an
             # hour, old values and files are removed. if all values of a metric
             # are removed from a system, the accompanying metric record is also
@@ -90,6 +53,11 @@ module Perus::Server
                         start = Time.now
                         Perus::Server::DB.cleanup
                         Stats.cleaned!(Time.now - start)
+
+                        start = Time.now
+                        @db.execute('vacuum')
+                        Stats.vacuumed!(Time.now - start)
+
                         complete = true
                         puts "Cleaning complete"
                         

data/lib/perus/server/stats.rb

@@ -30,7 +30,9 @@ module Perus::Server
         end
 
         def save
-            IO.write(Server.options.stats_path, JSON.dump(@data))
+            File.open(Server.options.stats_path, 'w') do |f|
+                f.write(JSON.dump(@data))
+            end
         end
 
         # vacuuming

data/lib/perus/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perus
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Will Cannings
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-12 00:00:00.000000000 Z
+date: 2015-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler