sshfs_mount: improve log message output based on mount type

For normal mounts it will now output user/host information as well
dustymabe · Mar 30, 2016 · 941ec99 · 941ec99
1 parent 7676951
commit 941ec99
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/lib/vagrant-sshfs/cap/linux/sshfs_mount.rb b/lib/vagrant-sshfs/cap/linux/sshfs_mount.rb
@@ -53,10 +53,6 @@ def self.sshfs_mount_folder(machine, opts)
           hostpath = opts[:hostpath].dup
           hostpath.gsub!("'", "'\\\\''")
 
-          # Log some information
-          machine.ui.info(I18n.t("vagrant.sshfs.actions.mounting_folder", 
-                          hostpath: hostpath, guestpath: expanded_guest_path))
-
           # Add in some sshfs/fuse options that are common to both mount methods
           opts[:sshfs_opts] = ' -o allow_other ' # allow non-root users to access
           opts[:sshfs_opts]+= ' -o noauto_cache '# disable caching based on mtime
@@ -100,8 +96,11 @@ def self.sshfs_slave_mount(machine, opts, hostpath, expanded_guest_path)
           ssh_cmd = ssh_path + ssh_opts + machine.ssh_info[:host]
           ssh_cmd+= ' "' + sshfs_cmd + '"'
 
+          # Log some information
           @@logger.debug("sftp-server cmd: #{sftp_server_cmd}")
           @@logger.debug("ssh cmd: #{ssh_cmd}")
+          machine.ui.info(I18n.t("vagrant.sshfs.actions.slave_mounting_folder", 
+                          hostpath: hostpath, guestpath: expanded_guest_path))
 
           # Create two named pipes for communication between sftp-server and
           # sshfs running in slave mode
@@ -171,6 +170,11 @@ def self.sshfs_normal_mount(machine, opts, hostpath, expanded_guest_path)
             echopipe = "echo '#{password}' | "
             sshfs_opts+= '-o password_stdin '
           end
+
+          # Log some information
+          machine.ui.info(I18n.t("vagrant.sshfs.actions.normal_mounting_folder", 
+                          user: username, host: host, 
+                          hostpath: hostpath, guestpath: expanded_guest_path))
 
           # Build up the command and connect
           error_class = VagrantPlugins::SyncedFolderSSHFS::Errors::SSHFSNormalMountFailed

diff --git a/locales/synced_folder_sshfs.yml b/locales/synced_folder_sshfs.yml
@@ -4,8 +4,10 @@ en:
       actions:
         installing: Installing SSHFS client...
         mounting: Mounting SSHFS shared folders...
-        mounting_folder: |-
+        slave_mounting_folder: |-
           Mounting folder via SSHFS: %{hostpath} => %{guestpath}
+        normal_mounting_folder: |-
+          Mounting folder via SSHFS: %{user}@%{host}:%{hostpath} => %{guestpath}
       ask:
         prompt_for_password: |-
           SSHFS password for '%{username}':