From cda69ff43bc8e5ea040eb98d8d9891ce7e0dd10c Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 5 Apr 2018 16:46:48 +0200 Subject: [RemoteReboot] Fix formatting --- .../openslx/taskmanager/tasks/RemoteReboot.java | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java index 38a9c12..828165f 100644 --- a/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java +++ b/src/main/java/org/openslx/taskmanager/tasks/RemoteReboot.java @@ -43,7 +43,7 @@ public class RemoteReboot extends AbstractTask @Expose private int port; - + private JSch sshClient; private Output status = new Output(); @@ -77,10 +77,10 @@ public class RemoteReboot extends AbstractTask status.locationId = locationId; status.locationName = locationName; - JSch.setConfig("StrictHostKeyChecking", "no"); + JSch.setConfig( "StrictHostKeyChecking", "no" ); sshClient = new JSch(); try { - sshClient.addIdentity("", sshkey.getBytes(), null, null); + sshClient.addIdentity( "", sshkey.getBytes(), null, null ); } catch ( JSchException e ) { status.addError( e.toString() ); return false; @@ -108,21 +108,21 @@ public class RemoteReboot extends AbstractTask int ret = -1; try { status.clientStatus.put( client.machineuuid, ClientStatus.CONNECTING ); - Session session = sshClient.getSession("root", client.clientip, port); - session.connect(5000); - ChannelExec channel = (ChannelExec) session.openChannel("exec"); + Session session = sshClient.getSession( "root", client.clientip, port ); + session.connect( 5000 ); + ChannelExec channel = (ChannelExec)session.openChannel( "exec" ); - String args = " " + minutes + " " + String.format("'%s'", client.machineuuid.replace("'", "'\\''")); + String args = " " + minutes + " " + String.format( "'%s'", client.machineuuid.replace( "'", "'\\''" ) ); if ( shutdown ) { channel.setCommand( SHUTDOWN_CMD + args ); - channel.connect(2000); - waitForCommand(channel, 2000); + channel.connect( 2000 ); + waitForCommand( channel, 2000 ); ret = channel.getExitStatus(); status.clientStatus.put( client.machineuuid, minutes == 0 ? ClientStatus.SHUTDOWN : ClientStatus.SHUTDOWN_AT ); } else { channel.setCommand( REBOOT_CMD + args ); - channel.connect(2000); - waitForCommand(channel, 2000); + channel.connect( 2000 ); + waitForCommand( channel, 2000 ); ret = channel.getExitStatus(); if ( ret == 0 ) { status.clientStatus.put( client.machineuuid, minutes == 0 ? ClientStatus.REBOOTING : ClientStatus.REBOOT_AT ); @@ -209,13 +209,17 @@ public class RemoteReboot extends AbstractTask return true; } - - private void waitForCommand(ChannelExec channel, int timeout) { + + private void waitForCommand( ChannelExec channel, int timeout ) + { for ( int i = 0; i < timeout / 100; i++ ) { - if ( channel.isClosed() ) { break; } + if ( channel.isClosed() ) { + break; + } try { - Thread.sleep(100); - } catch (InterruptedException e) {} + Thread.sleep( 100 ); + } catch ( InterruptedException e ) { + } } } -- cgit v1.2.3-55-g7522