canzea 0.1.68 → 0.1.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66118112f0f957613b280ca67f65bcebcb89d31b
-  data.tar.gz: 31104a3cf3b7f25148772a5559eea102419b7e57
+  metadata.gz: 07dc4c1aadbd19f8106535b8325927e968cedc3c
+  data.tar.gz: e71d34bd52ad13fefd94cc246847ba5ff6627214
 SHA512:
-  metadata.gz: 239141a64ec67686b4a18e11dd3284205534101fdeb70b3bd64e52fa06df1859bae7b848b9b451fcd412c2d13c3f550fe34a4f60064c345e445d8b6817561fcf
-  data.tar.gz: bfeddf0f43d68def281f8b6d4a08c767d92a686edbf4b3f3fbbc9def120994530fe695b6e2f5580a05b0b1c5283b7122134bd909c7d720bce368ce872d9cbbc5
+  metadata.gz: 52331702b5d5882e6b4bf03c2d79c72aac8c4c233b35826da71a2d8f40b49b6511173ec3437a8592b16e3f72edf9deb4666d5771b65ac8da6ca449a777ca2eac
+  data.tar.gz: d8184297a9dfcece6d6114fdda76c790f76721fac4d0bfa9a7c2fcc29ca72d1f0612e30237a19ba94111799a34cf0d8aa028a597e96b955ec69adba8e496e9a8

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.68"
+  VERSION = "0.1.70"
 end

data/lib/commands/add-env.rb

@@ -34,7 +34,7 @@ class AddEnv
 
     def injectEnvironmentVariables()
         extraConfig = Canzea::config[:catalog_location] + "/env.json"
-        @log.info "Looking to read env.json"
+        @log.info "Looking at for env vars: #{extraConfig}"
         if File.exists?(extraConfig)
             puts "-- Reading #{extraConfig}"
             file = File.read(extraConfig)

data/lib/commands/apply-config.rb

@@ -13,27 +13,35 @@ class ApplyConfig
 
         # Read the configuration file and make calls out to run
 
-        @log.info("Processing #{gitRoot}/configure.json")
-        puts "Processing #{gitRoot}/configure.json"
+        log "Processing #{gitRoot}/configure.json"
+
         steps = JSON.parse(File.read("#{gitRoot}/configure.json"))
 
+        AddEnv.new.injectEnvironmentVariables()
+
         index = 1
         steps["steps"].each { | step |
 
-            AddEnv.new.injectEnvironmentVariables()
+
+            ref = "Step #{index.to_s.rjust(2, "0")} / #{steps['steps'].length}"
 
             role = step['role']
             solution = step['solution']
-            puts "#{stepNum} and #{index}"
+
             if (stepNum == nil or index >= Integer(stepNum))
-                @log.info "[#{index}] Configure for #{role} and #{solution}"
-                ps.runPhaseConfigure role, solution, test, (task == nil ? 1:task)
+                log "  [#{ref}] Configure for #{role} and #{solution}"
+                ps.runPhaseConfigure role, solution, test, (task == nil ? 1:task), ref
                 task = 1
             else
-                @log.info "[#{index}] Configure for #{role} and #{solution} SKIP"
+                log "  [#{ref}] Configure for #{role} and #{solution} SKIP"
             end
             index = index + 1
         }
     end
 
+    def log (msg)
+        puts msg
+        @log.info(msg)
+    end
+
 end

data/lib/commands/prepare-plan.rb

@@ -6,6 +6,7 @@ require 'canzea/config'
 
 class PreparePlan
     def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
         @basePath = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/catalog"
     end
 
@@ -13,12 +14,12 @@ class PreparePlan
     def do (blueprint, segment, step, test, privateKey, serverBase, serverNumber)
         planStep = PlanStep.new
 
-        puts "Processing configure.json for #{segment} in #{blueprint} from #{@basePath}"
+        log "Processing configure.json for #{segment} in #{blueprint} from #{@basePath}"
 
         instructions = YAML.load_file("#{@basePath}/blueprints/#{blueprint}/instruction.yml")
         segment = instructions['instructions']['segments'][segment]
 
-        puts segment['abbreviation']
+        log segment['abbreviation']
 
         index = 1
         segment['image'].each { |item|
@@ -26,12 +27,12 @@ class PreparePlan
                 parts = item.split(':')
 
                 if (index < Integer(step))
-                    puts "[#{index}] #{item} SKIPPING"
+                    log "[#{index.to_s.rjust(2, "0")}] #{item} SKIPPING"
                 else
-                    puts "[#{index}] #{item}"
+                    log "[#{index.to_s.rjust(2, "0")}] #{item}"
                     if (test == false)
                         publicIp = File.read("#{Canzea::config[:pwd]}/vps-#{serverBase}-#{serverNumber}.json")
-                        RemoteRun.new.do publicIp, privateKey, parts[1], parts[2]
+                        RemoteRun.new.do publicIp, privateKey, parts[1], parts[2], index.to_s.rjust(2, "0")
                         # Keep track of what we have done; parsing the response and looking at the JSON
                     end
                 end
@@ -40,4 +41,8 @@ class PreparePlan
         }
     end
 
+    def log (msg)
+        puts "-- #{msg}"
+        @log.info(msg)
+    end
 end

data/lib/commands/remote-bootstrap.rb

@@ -4,6 +4,10 @@ require "pathname"
 require "ssh-base-cmd-class"
 
 class RemoteInit
+    def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
+
     def do (publicIp, privateKey)
         cmd1 = "yum -y install git"
 
@@ -20,15 +24,15 @@ class RemoteInit
 
         remote = RemoteCall.new
 
-        remote.exec publicIp, privateKey, cmd1
-        remote.exec publicIp, privateKey, cmd2
-        remote.exec publicIp, privateKey, cmd3
-        remote.exec publicIp, privateKey, cmd4
-        remote.exec publicIp, privateKey, cmd5
-        remote.exec publicIp, privateKey, cmd6
-        remote.exec publicIp, privateKey, cmd7
-        remote.exec publicIp, privateKey, cmd8
-        remote.exec publicIp, privateKey, cmd9
+        remote.exec publicIp, privateKey, cmd1, "1-9"
+        remote.exec publicIp, privateKey, cmd2, "2-9"
+        remote.exec publicIp, privateKey, cmd3, "3-9"
+        remote.exec publicIp, privateKey, cmd4, "4-9"
+        remote.exec publicIp, privateKey, cmd5, "5-9"
+        remote.exec publicIp, privateKey, cmd6, "6-9"
+        remote.exec publicIp, privateKey, cmd7, "7-9"
+        remote.exec publicIp, privateKey, cmd8, "8-9"
+        remote.exec publicIp, privateKey, cmd9, "9-9"
     end
 
 end

data/lib/commands/remote-run.rb

@@ -4,8 +4,8 @@ require "pathname"
 require "ssh-base-cmd-class"
 
 class RemoteRun
-    def do(publicIp, privateKey, role, solution)
+    def do(publicIp, privateKey, role, solution, ref="")
       remote = RemoteCall.new
-      remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution}"
+      remote.exec publicIp, privateKey, "canzea --lifecycle=install --role=#{role} --solution=#{solution}", ref
     end
 end

data/lib/plan-step-class.rb

@@ -49,7 +49,7 @@ class PlanStep
         end
     end
 
-    def runPhaseConfigure (role, solution, test, task)
+    def runPhaseConfigure (role, solution, test, task, ref="")
 
         plan = JSON.parse("{ \"plan\": [ { \"role\": \"#{role}\", \"solution\": \"#{solution}\" } ] }")
 
@@ -64,11 +64,10 @@ class PlanStep
         begin
 
             plan['plan'].each do |item|
-                @log.info(item['solution'])
 
                 root = "#{@basePath}/roles/#{item['role']}/#{item['solution']}"
                 if File.exist?(root) == false
-                    puts "-- ERROR #{root} does not exist!"
+                    log "-- ERROR #{root} does not exist!"
                     raise "#{root} does not exist!"
                 end
 
@@ -83,7 +82,7 @@ class PlanStep
                             svc = md['services'][0]
 
                             adef = {"listener"=>svc['listener'], "service"=>svc['name'], "tags"=>[ item['role'] ], "port"=>svc['port']}
-                            puts "-- Registering #{svc['name']}"
+                            log "-- Registering #{svc['name']}"
                             h = HelperRun.new
                             h.run "consul", "register_service", JSON.generate(adef)
                         end
@@ -99,23 +98,17 @@ class PlanStep
 
                 cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/configure.sh"
                 if File.exist?(cmd)
-                  lines = n.run cmd, start, lines - 1
-
-                  @log.info("#{ lines } lines read")
+                  lines = n.run cmd, start, lines - 1, false, ref
                 end
 
                 cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/enable.sh"
                 if File.exist?(cmd)
-                  lines = n.run cmd, start, lines - 1
-
-                  @log.info("#{ lines } lines read")
+                  lines = n.run cmd, start, lines - 1, false, ref
                 end
 
                 cmd = "#{@basePath}/roles/#{item['role']}/#{item['solution']}/status.sh"
                 if File.exist?(cmd)
-                  lines = n.run cmd, start, lines - 1, true
-
-                  @log.info("#{ lines } lines read")
+                  lines = n.run cmd, start, lines - 1, true, ref
                 end
 
             end
@@ -126,4 +119,10 @@ class PlanStep
             abort()
         end
     end
+
+    def log (msg)
+        puts msg
+        @log.info(msg)
+    end
+
 end

data/lib/ssh-base-cmd-class.rb

@@ -7,38 +7,54 @@ require 'openssl'
 require 'base64'
 
 class RemoteCall
-    def exec (hostname, privateKey, cmd)
+    def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
+
+    def exec (hostname, privateKey, cmd, ref = "")
 
         @username = "root"
 
-        Net::SSH.start(hostname, @username, :paranoid => false, :keys => [privateKey]) do |ssh|
+        @log.info("    R [#{ref}] COMMAND: #{cmd}")
 
-            chan = ssh.open_channel do |channel|
-                channel.request_pty
-                channel.env("DIGITAL_OCEAN_API_KEY", ENV['DIGITAL_OCEAN_API_KEY'])
-                channel.env("VAULT_TOKEN", ENV['VAULT_TOKEN'])
-                channel.env("CONSUL_URL", ENV['CONSUL_URL'])
-                channel.env("WORK_DIR", ENV['WORK_DIR'])
-                channel.exec(cmd) do |ch, success|
-                    abort "could not execute command" unless success
-
-                    channel.on_data do |ch, data|
-                      puts data
-                    end
+        begin
+            Net::SSH.start(hostname, @username, :paranoid => false, :keys => [privateKey]) do |ssh|
+
+                chan = ssh.open_channel do |channel|
+                    channel.request_pty
+                    channel.env("DIGITAL_OCEAN_API_KEY", ENV['DIGITAL_OCEAN_API_KEY'])
+                    channel.env("VAULT_TOKEN", ENV['VAULT_TOKEN'])
+                    channel.env("CONSUL_URL", ENV['CONSUL_URL'])
+                    channel.env("WORK_DIR", ENV['WORK_DIR'])
+                    channel.exec(cmd) do |ch, success|
+                        abort "could not execute command" unless success
+
+                        channel.on_data do |ch, data|
+                          puts data
 
-                    channel.on_request("exit-status") do |ch, data|
-                        exit_code = data.read_long
-                        if (exit_code == 0)
-                        else
-                            abort()
+                          data.sub(/\n/, '').scan(/.{1,80}/).each do | line |
+                              @log.info("    R [#{ref}]  STDOUT: #{line}")
+                          end
+                        end
+
+                        channel.on_request("exit-status") do |ch, data|
+                            exit_code = data.read_long
+                            @log.info("    R [#{ref}] Exit status: #{exit_code}")
+                            if (exit_code == 0)
+                            else
+                                abort()
+                            end
                         end
-                    end
 
-                    channel.on_close do |ch|
+                        channel.on_close do |ch|
+                        end
                     end
                 end
+                chan.wait
             end
-            chan.wait
+        rescue
+            @log.info("    R ABORTED!")
+            raise
         end
     end
 
@@ -63,6 +79,8 @@ class RemoteCall
         @username = "root"
 
         puts "Uploading #{localFile} to #{remoteFile}"
+        @log.info("    R : Uploading to #{hostname}")
+        @log.info("    R : Uploading #{localFile} to #{remoteFile}")
         Net::SSH.start(hostname, @username, :paranoid => false, :keys => [privateKey]) do |ssh|
             ssh.sftp.upload!(localFile, remoteFile)
         end
@@ -72,9 +90,13 @@ class RemoteCall
 
         @username = "root"
 
+        @log.info("    R : Getting from #{hostname}")
+        @log.info("    R : Getting file #{remoteFile}")
+
         Net::SSH.start(hostname, @username, :paranoid => false, :keys => [privateKey]) do |ssh|
             ssh.sftp.download!(remoteFile, localFile)
         end
+        @log.info("    R : Saved to #{localFile}")
     end
 
 end

data/lib/trace-component.rb

@@ -25,25 +25,26 @@ end
 class Worker
     @test = false
 
+    def initialize ()
+        @log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
+    end
 
     def test (t)
         @test = t
     end
 
-    def run(command, start, lines, statusIndicator = false )
+    def run(command, start, lines, statusIndicator = false, ref = "" )
         audit = Audit.new
 
-	    log = Logger.new(Canzea::config[:logging_root] + '/plans.log')
-
-        log.info("HANDLING: " + command)
+        @log.info("     [#{ref}] HANDLING: " + command)
 
         File.foreach(command) { |l|
             if ( l.start_with?('## ') )
-                log.info "#{lines + 1} Label: " + l
+                @log.info "#{lines + 1} Label: " + l
             elsif ( l.start_with?('#') )
             elsif ( /\S/ !~ l )
             elsif ( l.chomp.end_with?(".sh") && !l.chomp.end_with?(".atomic.sh") && !l.include?("cp ") && !l.include?("chmod") )
-                log.info("#{lines + 1} RECURSE: " + l)
+                @log.info("     [#{ref}] RECURSE: " + l)
 
                 workingDir = "#{Pathname.new(Canzea::config[:catalog_location]).realpath}/catalog"
 
@@ -56,7 +57,7 @@ class Worker
             else
 
                 if ( (lines + 1) < start )
-                    log.info("Skipping : #{lines + 1} #{l}")
+                    @log.info("     [#{ref}] Skipping : #{lines + 1} #{l}")
                     lines += 1
                     next
                 end
@@ -64,7 +65,7 @@ class Worker
 
                 audit.start( "#{lines + 1 }", l.chomp)
 
-                log.info("#{lines + 1} FOUND: " + l)
+                @log.info("     [#{ref}] #{(lines + 1).to_s.rjust(2, "0")} : " + l)
 
                 if @test == false
                     t1 = Time.now
@@ -102,9 +103,9 @@ class Worker
 
                               puts "-- Exit Status = #{exit_status}"
 
-                              log.info("STDOUT #{output}")
+                              @log.info("STDOUT #{output}")
 
-                              log.info("Exit Status = #{exit_status}")
+                              @log.info("Exit Status = #{exit_status}")
 
                               # if exit status is failure then exit right away
 
@@ -129,7 +130,7 @@ class Worker
                         raise
                     end
                 else
-                    puts "-- TEST -- [#{lines + 1}] FOUND: " + l
+                    puts "-- TEST [#{lines + 1}] FOUND: " + l
                 end
 
             end

data/lib/trace-runner.rb

@@ -32,8 +32,6 @@ class RunnerWorker
 
         audit.start( "#{lines + 1 }", l.chomp)
 
-        log.info("#{lines + 1} FOUND: " + l)
-
         t1 = Time.now
 
         workingDir = Canzea::config[:pwd]
@@ -57,22 +55,25 @@ class RunnerWorker
 
               log_w.close_write
 
+              t2 = Time.now
+              msecs = time_diff_milli t1, t2
+
               output = log_w.string
 
-              output.split(/\n/).each do | line |
-                  puts "-- #{line}"
+              output.scan(/.{1,80}/).each do | line |
+                  log.info("STDOUT: #{line}")
               end
-              puts "-- Exit Status = #{exit_status}"
-
-              log.info("STDOUT #{output}")
 
               log.info("Exit Status = #{exit_status}")
+              log.info("Completed in (ms) : #{msecs}")
 
-              # if exit status is failure then exit right away
+              puts "-- Exit Status = #{exit_status}"
+              output.split(/\n/).each do | line |
+                  puts "-- #{line}"
+              end
 
-              t2 = Time.now
 
-              msecs = time_diff_milli t1, t2
+              # if exit status is failure then exit right away
 
               audit.complete("#{lines + 1}", l.chomp, exit_status.exitstatus, msecs, output)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.68
+  version: 0.1.70
 platform: ruby
 authors:
 - Canzea Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-03 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler