lib/right_chimp/exec/ExecSSH.rb in right_chimp-1.1.3 vs lib/right_chimp/exec/ExecSSH.rb in right_chimp-2.0

@@ -9,18 +9,13 @@
       super(h)
       @ssh_user = h[:ssh_user]
     end
     
     def run
-      host = @server['ip_address'] || @server['ip-address'] || nil
+      host = @server.ip_address || nil
       @ssh_user ||= "root"
-      
-      if host == nil
-        @server.settings
-        host = @server['ip_address'] || @server['ip-address']
-      end
-      
+
       run_with_retry do
         Log.debug "ssh #{@ssh_user}@#{host} \"#{@exec}\""
         success = system("ssh -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no #{@ssh_user}@#{host} \"#{@exec}\"")
         
         if not $?.success?
@@ -28,18 +23,18 @@
         end
       end
     end
     
     def describe_work
-      return "ExecSSH job_id=#{@job_id} command=\"#{@exec}\" server=\"#{@server['nickname']}\""
+      return "ExecSSH job_id=#{@job_id} command=\"#{@exec}\" server=\"#{@server.nickname}\""
     end
     
     def info
       return @exec.to_s
     end
     
     def target
-      return @server['nickname']
+      return @server.nickname
     end
     
   end
 end
\ No newline at end of file