cleaned up logging, and much improved error message when file is not found

1 files changed, 5 insertions, 5 deletions

diff --git a/lib/leap_cli/commands/node.rb b/lib/leap_cli/commands/node.rb
index 4956d64..61e463b 100644
--- a/lib/leap_cli/commands/node.rb
+++ b/lib/leap_cli/commands/node.rb
@@ -26,7 +26,7 @@ module LeapCli; module Commands
         ssh.install_authorized_keys
         ssh.install_prerequisites
       end
-      progress("Completed: init-node #{node.name}")
+      log("Completed: init-node #{node.name}")
     end
   end
 
@@ -87,17 +87,17 @@ module LeapCli; module Commands
   # see `man sshd` for the format of known_hosts
   #
   def save_public_host_key(node)
-    progress("Fetching public SSH host key for #{node.name}")
+    log("Fetching public SSH host key for #{node.name}")
     public_key = get_public_key_for_ip(node.ip_address, node.ssh.port)
     pub_key_path = Path.named_path([:node_ssh_pub_key, node.name])
     if Path.exists?(pub_key_path)
       if public_key == SshKey.load_from_file(pub_key_path)
-        progress("Public SSH host key for #{node.name} has not changed")
+        log("Public SSH host key for #{node.name} has not changed")
       else
         bail!("WARNING: The public SSH host key we just fetched for #{node.name} doesn't match what we have saved previously. Remove the file #{pub_key_path} if you really want to change it.")
       end
     elsif public_key.in_known_hosts?(node.name, node.ip_address, node.domain.name)
-      progress("Public SSH host key for #{node.name} is trusted (key found in your ~/.ssh/known_hosts)")
+      log("Public SSH host key for #{node.name} is trusted (key found in your ~/.ssh/known_hosts)")
     else
       puts
       say("This is the SSH host key you got back from node \"#{node.name}\"")
@@ -123,7 +123,7 @@ module LeapCli; module Commands
   end
 
   def ping_node(node)
-    progress("Pinging #{node.name}")
+    log("Pinging #{node.name}")
     assert_run!("ping -W 1 -c 1 #{node.ip_address}", "Could not ping #{node.name} (address #{node.ip_address}). Try again, we only send a single ping.")
   end