elasticsearch_s3_backup 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb50948a3bda279ddb2a7c313d81aa2cd34ca27f
-  data.tar.gz: c531e2cfb7d94ae65715c851546aec12b8f363c5
+  metadata.gz: dc0fd72a92d1558e5220e4c9e29890fc7a42a5ef
+  data.tar.gz: 6728b0a29e270e15d12cf471930663e6bb4e8bc9
 SHA512:
-  metadata.gz: 4937590b726d5c3a35359516ecd0f6fbaf1428e42386584446a8069b0483cd266eb0c79d925f70a0e4705d32ad25fdfb96fbdd53ab787815b187953f432d8b69
-  data.tar.gz: 8d3afe750e32aa36ed73934b650b48395a3d2dec5e83b0df1c8298dd54153d7a02f0e91ca9ee8340eaaf3bfc84b7bf13177a4493e196eb40d64c597dff052a48
+  metadata.gz: 8383b52217f7b1e8ce01b6bee2a4360a548c4f73436922aa525ec2ba77bf462ace38c29589f4547c589bfd0f0f6315742d9640e8c49773a575b3161aaba694fd
+  data.tar.gz: 8f5f0cf9324f4615310c892f66418ef4ae8d786c74d04388a14e7e7150e26b6a375682dab3b3dfe8bb9f7b565ae7ca691a2d5a4f4a3de33eb4b86ec6e1220e16

data/lib/elasticsearch_s3_backup.rb

@@ -61,12 +61,12 @@ module EverTools
     def es_api
       @es_api ||= begin
         es_host = @conf['es_host'] || 'localhost'
-        Elasticsearch::Client.new URI "http://#{auth}@#{es_host}:9200"
+        Elasticsearch::Client.new host: "http://#{auth}@#{es_host}:9200"
       end
     end
 
     def master?
-      es_api.nodes.info['nodes'][es_api.cluster.state['master_node']]['node'] == node_name
+      es_api.nodes.info['nodes'][es_api.cluster.state['master_node']]['name'] == node_name
     end
 
     def pseudo_random_string
@@ -167,7 +167,7 @@ module EverTools
     def run
       unless master?
         logger.info 'This node is not the currently elected master. Exiting.'
-        exit 0
+        exit
       end
 
       insert_test_data
@@ -184,6 +184,14 @@ module EverTools
 
       remove_expired_backups
       logger.info 'Finished'
+    rescue Interrupt
+      puts "Received #{e.class}"
+      exit 99
+    rescue SignalException => e
+      logger.info "Received: #{e.signm} (#{e.signo})"
+      exit 2
+    rescue SystemExit => e
+      exit e.status
     rescue Exception => e # Need to rescue "Exception" so that Sentry gets it
       notify e
       logger.fatal e.message

data/lib/elasticsearch_s3_backup/version.rb

@@ -1,5 +1,5 @@
 module EverTools
   class ElasticsearchS3Backup
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elasticsearch_s3_backup
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Eric Herot