seapig-postgresql-notifier 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50448368cc1de622442aaaf0b5bfcc58be12e641
-  data.tar.gz: 27cbd3f1ba86bdd1dc0e8d2aee2731368eefaa6a
+  metadata.gz: 72309a9b93cf680567c2aa344893cd3bcfa3b6e9
+  data.tar.gz: 3d4104a5d3e48008abc200babfa2485c05dc8e05
 SHA512:
-  metadata.gz: 2113ccfffa3ee07c043c602704beca2b2d4124ecdc703791fde870883e2abbf6e231400628a0980cd5fb72b44dbb34c085f9cac8cd954c5ffa1f3b6f136182f1
-  data.tar.gz: 579dfa4bfdf826fec17104961312228cfadcd07239f760e3c6ff4a24416eb94445ad6bcc3acaece8b02e6e552aaa937bc6990e4f0f73194632f7e8b4fb4e3fc1
+  metadata.gz: a355d83e98ea084861838eb0e84233b0fff97e77a52e46acaac0476bdba35b076c8cc38051154ef3dce45021863a3c026ce990bf164df582d716edd314a36097
+  data.tar.gz: '0809639f8e9305e7852704870e12c8f8cf76b741f2170363dd1d6ab260de6481b3650582bb6146cd9a6588fd837882c2d122dacdc2ee13bd5ee70155d35f4961'

data/bin/seapig-postgresql-notifier

@@ -12,8 +12,9 @@ STDOUT.sync = true
 OPTIONS = Slop.parse { |o|
 	o.string '-c', '--connect', "Seapig server address (default: ws://127.0.0.1:3001)", default: "ws://127.0.0.1:3001"
 	o.array '-i', '--intervals', 'List of durations for interval objects (e.g. 1,60,3600)', default: ""
-	o.string '-d', '--database-url', 'Database URL (e.g. postgres://USER:PASS@PGHOST/DBNAME)'
+	o.string '-b', '--database-url', 'Database URL (e.g. postgres://USER:PASS@PGHOST/DBNAME)'
 	o.string '-e', '--environment' , 'Rails environment to use when loading database config from config/database.yml'
+	o.bool '-d', '--debug', 'Show debug messages'
 	o.on '-h', '--help' do puts o; exit end
 }
 
@@ -21,26 +22,28 @@ if (not OPTIONS["database-url"]) and (not File.exist?("config/database.yml")) th
 database_config = (OPTIONS["database-url"] or YAML.load_file("config/database.yml")[(OPTIONS["environment"] or ENV["RAILS_ENV"] or "development")])
 ActiveRecord::Base.establish_connection(database_config)
 
+startup_resend_condition = " OR updated_at > (SELECT max(updated_at) FROM seapig_dependencies) - INTERVAL '60 seconds'" # timeout hits in 20-30s so 60s should be safe
 
 EM.run {
 
-	client = SeapigClient.new(OPTIONS["connect"], name: 'notifier')
+	client = SeapigClient.new(OPTIONS["connect"], name: 'notifier', debug: OPTIONS.debug?)
+
 	master_object = client.master(SeapigDependency::OBJECT_PREFIX+"*")
 	master_object.onproduce { |child|
 		version = (SeapigDependency.version(child.id[SeapigDependency::OBJECT_PREFIX.size .. -1]) or 0)
 		child.set(version: version)
-		puts 'Dependency version produced: %30s:%-10s'%[child.id,version]
+		puts 'Dependency version produced: %30s    version: %-10s'%[child.id,version]
 	}
 
-
 	on_database_change = Proc.new {
 		next if not client.connected
-		SeapigDependency.where("current_version != reported_version").each { |seapig_dependency|
-			puts "Dependency version changed: %30s:%-10s"%[seapig_dependency.name,seapig_dependency.current_version]
+		SeapigDependency.where("current_version != reported_version"+startup_resend_condition).each { |seapig_dependency|
+			puts "Dependency version changed, uploading: %30s    version:%-10s"%[seapig_dependency.name,seapig_dependency.current_version]
 			master_object[SeapigDependency::OBJECT_PREFIX+seapig_dependency.name].set(version: seapig_dependency.current_version)
 			seapig_dependency.reported_version = seapig_dependency.current_version
 			seapig_dependency.save!
 		}
+		startup_resend_condition = ""
 	}
 
 
@@ -73,6 +76,6 @@ EM.run {
 		}
 	}
 
-	EM.schedule on_database_change
 
+	client.onstatuschange { EM.schedule on_database_change }
 }

data/lib/seapig-postgresql-notifier/version.rb

@@ -1,3 +1,3 @@
 module SeapigPostgresqlNotifier
-	VERSION = "0.2.0"
+	VERSION = "0.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: seapig-postgresql-notifier
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - yunta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-26 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: slop
   requirement: !ruby/object:Gem::Requirement