bin/omf6 in nitos_testbed_rc-1.0.0.pre.12 vs bin/omf6 in nitos_testbed_rc-1.0.0.pre.13

- old
+ new

@@ -100,11 +100,15 @@ elsif client_msg.read_property("event") == "EXIT" @load_complete[client_msg.read_property("node")] = 100 overall = @load_complete.values.inject(:+) progress_bar.count = ( overall / @nodes_up_pxe.length) progress_bar.write - msg = client_msg.read_property("msg").split("\n") + if client_msg.read_property("msg") + msg = client_msg.read_property("msg").split("\n") + else + puts "ERROR: Frisbee client exit with no msg." + end @load_end_msg += "#{client_msg.read_property("node")}: #{"#{msg[0]} #{msg[1][14..29]}"}\n" comm.subscribe('cm_factory') do |controller| controller.on_message do |cm_msg| if cm_msg.operation == :inform case cm_msg.read_content("itype") @@ -414,12 +418,16 @@ if client_msg.read_property("event") == "STDOUT" # print "#{client_msg.read_property("msg")}" elsif client_msg.read_property("event") == "EXIT" stop_saving() puts "INFO:" - client_msg.read_property("msg").split("\n").each do |line| - puts "INFO: #{line}" + if client_msg.read_property("msg") + client_msg.read_property("msg").split("\n").each do |line| + puts "INFO: #{line}" + end + else + puts "ERROR: Imagezip stopped with no msg." end puts "INFO: Image was saved in '#{@frisbee[:imageDir]}/#{@image}'" puts "INFO:" comm.subscribe('cm_factory') do |controller| controller.on_message do |cm_msg| @@ -504,10 +512,9 @@ fcontroller.request([:ports]) do |m| port = m.read_property("ports") start_saving() puts "INFO: Starting Imagezip Server on port '#{port}'" create_imagezip_server(comm, fcontroller, port, options) - sleep 1 puts "INFO: Starting Imagezip Client on node '#{options[:node]}'" create_imagezip_client(comm, fcontroller, options[:node], port, options) print "INFO: Saving Image for node '#{options[:node]}'..." show_wait_spinner(5){ while saving? \ No newline at end of file