drebs 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzZmNzdhMDEzZDQ0YmNhNzMxYzY2NTcyOTRjMzA0NmY4OGRiYzllNg==
+    YzE1MjM4ZjhlYzBjMmZkNGFkYmJlNGZjMmVmMWExYWI5ZDFlYzEyZg==
   data.tar.gz: !binary |-
-    MTJkZTJiMmJiYjYxYmU4ODQ4OWRiNjYwNTMwZjQzZWYxYjk1MzMzNw==
+    ZjUyYjgwNmQ2YzU0Y2Q4ZThiZTExNWI1MDRjY2Y0ZTAwZjJhNjUyYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTU2MWMzYjhmMjU3ZDc2NzFiNGZlYjkwMWNjNzhiZGZkN2YyNTI3NGVmOTgy
-    MGY5NTllYzVhOTlhZGNkOWFjOTkwNDdlZmE1MmViNzU4MzllNjI3OGJhNWU2
-    MWRmZTY2OGYyNGI3NjljNDJjMzQ3OWM1YTI3MmRhMTdlNTE1MjY=
+    OWQzNDk4ZjQ5MDY2NTJkNmIwODk2YTcxYjFkZjZhMGIxNDQ0OTg1ZDBlY2Fl
+    MDE1ZWI0NmY2MDYzMmY3ZjdjZDg1OGRjMzkwMmZhZWRmOWIxNzFmZDJkYWQ1
+    YzUyZjdhNzVhMGJmYThlY2E3Yjg1ZTJkMDJhMDg2YzViNzQzN2E=
   data.tar.gz: !binary |-
-    Y2FlZGU0NjlkNzU3NzMwNDVjYjgyZGQxNjY4NGU0YzJiNjZkODdmZGQzNmVk
-    YjQyNzU2OTgxZTMyZTIyZDEyNjM2NDA3ZjNjYWU2ZWNjNGNhNDFhMmQ1ZjQ5
-    NGMwNThmOGFkMzAzM2EzY2QyZTE3MGNiYjA0YWZjYWNiMWVmNmI=
+    ZWZkMDc1MDI0ZTVjOTUwMzUyMWU2MTU2OTVmOGYyZWQxNWUxMGM0YWJhOWEz
+    OGIyMDg2Yjg3N2ViM2RiZThmYzM1ZjdiZGFiYWNlNTBjZDdiZTU3NWM3NDM4
+    ODE3ZDY0MGQyZGY3ZmRiNTRhMzNiNjVkMWEzNTQ5N2QzYzExODc=

data/drebs.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
 spec.name = "drebs"
-spec.version = "0.1.1"
+spec.version = "0.1.2"
 spec.platform = Gem::Platform::RUBY
 spec.summary = "drebs"
 spec.description = "drebs: Disaster Recovery for Elastic Block Store. An AWS EBS backup script."

data/lib/drebs.rb

@@ -5,7 +5,7 @@
 # DREBS libs
 #
   module DREBS
-    Version = '0.1.1' unless defined?(Version)
+    Version = '0.1.2' unless defined?(Version)
 
     def version
       DREBS::Version

data/lib/drebs/cloud.rb

@@ -1,4 +1,5 @@
 require 'right_aws'
+require 'date'
 
 module Drebs
   class Cloud
@@ -46,22 +47,26 @@ module Drebs
         return a_snapshot if a_snapshot[:aws_id] == snapshot_id
       }
     end
-    
+
     def create_local_snapshot(pre_snapshot_tasks, post_snapshot_tasks, mount_point)
       local_instance=find_local_instance
       ip = local_instance[:ip_address]
       instance_id = local_instance[:aws_instance_id]
+      instance_tags = ec2.describe_tags(:filters => {"resource-id" => instance_id})
+      instance_name_tag = instance_tags.find{|t| t[:key] == "Name"}
+      instance_desc = instance_name_tag.nil? ? ip : instance_name_tag[:value]
       volume_id = local_instance[:block_device_mappings].select{|m| m[:device_name]==mount_point}.first[:ebs_volume_id]
+      timestamp = DateTime.now.strftime("%Y%m%d%H%M%S")
       return nil if not ebs = find_local_ebs(mount_point)
       pre_snapshot_tasks.each do |task|
         result, stdout, stderr = systemu(task)
         unless result.exitstatus == 0
           raise Exception.new(
-            "Error while executing pre-snapshot task: #{task} on #{ip}:#{mount_point} #{instance_id}:#{volume_id} "
+            "Error while executing pre-snapshot task: #{task} on #{instance_desc}:#{mount_point} #{instance_id}:#{volume_id} at #{timestamp}"
           )
         end
       end if pre_snapshot_tasks
-      snapshot = ec2.create_snapshot(ebs[:ebs_volume_id], "DREBS #{ip}:#{mount_point} #{instance_id}:#{volume_id}")
+      snapshot = ec2.create_snapshot(ebs[:ebs_volume_id], "DREBS #{instance_desc}:#{mount_point} #{instance_id}:#{volume_id} at #{timestamp}")
       Thread.new(snapshot[:aws_id], post_snapshot_tasks) do |snapshot_id, post_snapshot_tasks|
         1.upto(500) do |a|
           sleep(3)
@@ -71,7 +76,7 @@ module Drebs
           result = systemu(task)
           unless result.exitstatus == 0
             raise Exception.new(
-              "Error while executing post-snapshot task: #{task} on #{ip}:#{mount_point} #{instance_id}:#{volume_id} "
+              "Error while executing post-snapshot task: #{task} on #{instance_desc}:#{mount_point} #{instance_id}:#{volume_id} at #{timestamp}"
             )
           end
         end if post_snapshot_tasks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: drebs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Garett Shulman