[jbosstools-commits] JBoss Tools SVN: r41434 - in trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui: wizard and 1 other directory.

Author: xcoulon Date: 2012-05-25 13:01:48 -0400 (Fri, 25 May 2012) New Revision: 41434 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java Log: In progress - JBIDE-12005 Handle SSH auth fail correctly https://issues.jboss.org/browse/JBIDE-12005 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-05-25 16:14:11 UTC (rev 41433) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/TailServerLogAction.java 2012-05-25 17:01:48 UTC (rev 41434) @@ -17,6 +17,7 @@ import org.eclipse.jgit.transport.SshSessionFactory; import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.util.FS; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.console.IConsole; import org.eclipse.ui.console.IConsoleConstants; @@ -27,6 +28,7 @@ import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.ui.IServerModule; import org.jboss.tools.openshift.express.internal.core.behaviour.ExpressServerUtils; +import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils; import org.jboss.tools.openshift.express.internal.ui.console.JschToEclipseLogger; import org.jboss.tools.openshift.express.internal.ui.console.TailServerLogWorker; @@ -37,6 +39,7 @@ import com.jcraft.jsch.JSchException; import com.openshift.client.IApplication; import com.openshift.client.OpenShiftException; +import com.openshift.client.OpenShiftSSHOperationException; import com.openshift.client.utils.Base64Coder; /** @@ -128,10 +131,10 @@ consoleWorkers.put(console.getName(), tailServerLogWorker); Thread thread = new Thread(tailServerLogWorker); thread.start(); - } catch (Exception e) { - Logger.error("Failed to retrieve remote server logs", e); - console.newMessageStream().println("Failed to retrieve remote server logs: " + e.getMessage()); - console.newMessageStream().println("Please make sure your ssh key is added to your ssh preferences"); + } catch (IOException e) { + String message = NLS.bind("Failed to tail files for application ''{0}''.\n" + + "Please make sure your SSH key is confugred to the SSH2 workbench preferences", appName); + return OpenShiftUIActivator.createErrorStatus(message, e); } return Status.OK_STATUS; } @@ -149,29 +152,29 @@ * @param console * the console into which the tail should be writtent * @return the Worker that encapsulate the established RemoteSession, the tail Process and the output console + * @throws OpenShiftSSHOperationException * @throws JSchException * in case of underlying exception * @throws IOException * in case of underlying exception */ private TailServerLogWorker startTailProcess(final String host, final String appId, final String appName, - final MessageConsole console) throws JSchException, IOException { + final MessageConsole console) throws IOException { final String logFilePath = appName + "/logs/*.log"; final String options = "-f -n 100"; JSch.setLogger(new JschToEclipseLogger()); final SshSessionFactory sshSessionFactory = SshSessionFactory.getInstance(); final URIish uri = new URIish().setHost(host).setUser(appId); - RemoteSession remoteSession = sshSessionFactory.getSession(uri, CredentialsProvider.getDefault(), FS.DETECTED, + RemoteSession remoteSession; + remoteSession = sshSessionFactory.getSession(uri, CredentialsProvider.getDefault(), FS.DETECTED, 0); - // the rhc-tail-files command template // ssh_cmd = // "ssh -t #{app_uuid}(a)#{app}-#{namespace}.#{rhc_domain} 'tail#{opt['opts'] ? ' --opts ' + Base64::encode64(opt['opts']).chomp : ''} #{file_glob}'" final String command = buildCommand(logFilePath, options); Process process = remoteSession.exec(command, 0); return new TailServerLogWorker(console, process, remoteSession); - } /** Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-25 16:14:11 UTC (rev 41433) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-05-25 17:01:48 UTC (rev 41434) @@ -695,6 +695,14 @@ return true; } + /** + * + * @return + private boolean ensureHasSshKey() { + + } + */ + protected void loadOpenshiftResources(final DataBindingContext dbc) { try { WizardUtils.runInWizard(new Job("Loading existing applications...") {