Révision 28
.classpath (revision 28) | ||
---|---|---|
20 | 20 |
<classpathentry kind="lib" path="jsch-0.1.50.jar"/> |
21 | 21 |
<classpathentry kind="lib" path="log4j-1.2.16.jar"/> |
22 | 22 |
<classpathentry kind="lib" path="org.eclipse.wb.swt.widgets.baseline_1.3.0.r37x201202010053.jar"/> |
23 |
<classpathentry kind="lib" path="org.eclipse.swt.gtk.linux.x86_3.7.0.v3735b.jar"/>
|
|
23 |
<classpathentry kind="lib" path="/home/kreverch/Downloads/eclipse/plugins/org.eclipse.swt.gtk.linux.x86_64_3.102.0.v20130605-1544.jar"/>
|
|
24 | 24 |
<classpathentry kind="output" path="binary"/> |
25 | 25 |
</classpath> |
src/gZFS/gui.java (revision 28) | ||
---|---|---|
213 | 213 |
wPB = new guiProgress(shell.getDisplay(), shell.getLocation().x, shell.getLocation().y); |
214 | 214 |
shell.addListener(SWT.Close, new Listener() { |
215 | 215 |
public void handleEvent(final Event event) { |
216 |
zfs.disconnectServer(); |
|
216 |
zfs.disconnectAllServer();
|
|
217 | 217 |
} |
218 | 218 |
}); |
219 | 219 |
while (!shell.isDisposed()) { |
... | ... | |
496 | 496 |
btnConnectServer.setEnabled(true); |
497 | 497 |
tabFolderNav.setEnabled(true); |
498 | 498 |
wPB.close(); |
499 |
|
|
499 |
zfs.disconnectServer(); |
|
500 | 500 |
} |
501 | 501 |
|
502 | 502 |
} |
src/gZFS/zfs.java (revision 28) | ||
---|---|---|
107 | 107 |
} |
108 | 108 |
} |
109 | 109 |
|
110 |
public void disconnectServer(){ |
|
110 |
public void disconnectAllServer(){
|
|
111 | 111 |
String[] keysProp = (String[]) this.getCacheSession().keySet().toArray(new String[0]); |
112 | 112 |
Arrays.sort(keysProp); |
113 | 113 |
for ( int i=0;i<keysProp.length;i++){ |
114 | 114 |
String keyProp = keysProp[i]; |
115 | 115 |
this.setSession(getCacheSession().get(keyProp)); |
116 | 116 |
session.disconnect(); |
117 |
getCacheSession().remove(keyProp); |
|
117 | 118 |
} |
118 | 119 |
} |
120 |
public void disconnectServer(){ |
|
121 |
this.setSession(getCacheSession().get(this.getZserver().zProperties.get("serverIP").getValue())); |
|
122 |
session.disconnect(); |
|
123 |
getCacheSession().remove(this.getZserver().zProperties.get("serverIP").getValue()); |
|
124 |
} |
|
119 | 125 |
|
120 | 126 |
|
121 | 127 |
public Boolean executeCmd(String cmd) { |
... | ... | |
133 | 139 |
InputStream err = channel.getErrStream(); |
134 | 140 |
channel.connect(); |
135 | 141 |
log.debug("executeCmd "+cmd); |
136 |
BufferedReader reader = new BufferedReader(new InputStreamReader(err)); |
|
137 |
outErr = new StringBuilder(); |
|
138 |
String line; |
|
139 |
while ((line = reader.readLine()) != null) { |
|
140 |
outErr.append(line); |
|
142 |
if (!cmd.equals("/sbin/show-infodisk-cache")){ |
|
143 |
BufferedReader reader = new BufferedReader(new InputStreamReader(err)); |
|
144 |
outErr = new StringBuilder(); |
|
145 |
String line; |
|
146 |
while ((line = reader.readLine()) != null) { |
|
147 |
outErr.append(line); |
|
148 |
} |
|
141 | 149 |
} |
150 |
|
|
142 | 151 |
byte[] tmp = new byte[4096]; |
143 | 152 |
|
144 | 153 |
while (true) { |
Formats disponibles : Unified diff