From 645e0cbf24e9dc28e51d5b98ec70f2d16cfab061 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Tue, 17 Nov 2015 14:24:55 +0300
Subject: [PATCH] #891: events output to log

---
 devops-service/commands/stack.rb | 8 +++++++-
 devops-service/providers/ec2.rb  | 2 +-
 devops-service/workers/worker.rb | 1 +
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/devops-service/commands/stack.rb b/devops-service/commands/stack.rb
index 4508fea..637109f 100644
--- a/devops-service/commands/stack.rb
+++ b/devops-service/commands/stack.rb
@@ -21,10 +21,16 @@ module StackCommands
 
       begin
         out << "Syncing stack '#{stack.id}'...\n"
+        events_keys = []
         sleep_times.each do |sleep_time|
           sleep sleep_time
           stack.sync_details!
-          out.puts stack.events.inspect
+          stack.events.each do |event|
+            unless events_keys.include?(event["event_id"])
+              events_keys << event["event_id"]
+              out.puts "#{event["status"]}: #{event["reason"]}"
+            end
+          end
           case stack.stack_status
           when 'CREATE_IN_PROGRESS'
             out << "."
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 7a13e62..4cb3d9f 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -295,7 +295,7 @@ module Provider
     end
 
     def stack_events(stack)
-      cloud_formation.describe_stack_events(stack.name).body['StackEvents'].map{|se| {"stack_name" => se["StackName"], "stack_id" => se["StackId"], "event_id" => se["EventId"], "reason" => se["ResourceStatusReason"]}}
+      cloud_formation.describe_stack_events(stack.name).body['StackEvents'].map{|se| {"stack_name" => se["StackName"], "stack_id" => se["StackId"], "event_id" => se["EventId"], "reason" => se["ResourceStatusReason"], "status" => se["ResourceStatus"]}}
     end
 
     # не работает, не используется
diff --git a/devops-service/workers/worker.rb b/devops-service/workers/worker.rb
index 3c80a63..4b130e5 100644
--- a/devops-service/workers/worker.rb
+++ b/devops-service/workers/worker.rb
@@ -91,6 +91,7 @@ class Worker
         self.out = out
 
         job_result = yield(out, file)
+        out.puts "TODO: job_result: #{job_result}"
         canonical_status = (job_result == 0 ? STATUS::COMPLETED : STATUS::FAILED)
         update_job_status(canonical_status, job_result)
       rescue StandardError, RecordNotFound => e