nitro/G-Earth
1
0
Fork 0
mirror of https://github.com/sirjonasxx/G-Earth.git synced 2024-09-29 20:10:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

log extension out/errorstream

Browse Source
This commit is contained in:
sirjonasxx 2018-11-27 14:14:36 +01:00
parent 9f6951c762
commit 4173cf7a56
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
G-Earth/src/main/java/gearth/ui/extensions/executer/ExtensionRunner.java
View File

@ -5,6 +5,8 @@ package gearth.ui.extensions.executer;
*/ */
public interface ExtensionRunner { public interface ExtensionRunner {
String SHOW_EXTENSIONS_LOG = "--log-extensions";
void runAllExtensions(int port); void runAllExtensions(int port);
void installAndRunExtension(String path, int port); void installAndRunExtension(String path, int port);

48
G-Earth/src/main/java/gearth/ui/extensions/executer/NormalExtensionRunner.java
View File

@ -2,9 +2,12 @@ package gearth.ui.extensions.executer;
import gearth.Main; import gearth.Main;
import gearth.ui.extensions.authentication.Authenticator; import gearth.ui.extensions.authentication.Authenticator;
import org.omg.CORBA.Environment;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.net.URISyntaxException; import java.net.URISyntaxException;
import java.nio.file.*; import java.nio.file.*;
import java.util.Arrays; import java.util.Arrays;
@ -88,7 +91,50 @@ public class NormalExtensionRunner implements ExtensionRunner {
.replace("{port}", port+"") .replace("{port}", port+"")
.replace("{filename}", filename) .replace("{filename}", filename)
.replace("{cookie}", Authenticator.generateCookieForExtension(filename)); .replace("{cookie}", Authenticator.generateCookieForExtension(filename));
Runtime.getRuntime().exec(execCommand); Process proc = Runtime.getRuntime().exec(execCommand);
if (Main.hasFlag(ExtensionRunner.SHOW_EXTENSIONS_LOG)) {
String sep = "" + System.lineSeparator();
synchronized (System.out) {
System.out.println(path + sep + "Launching" + sep + "----------" + sep);
}
BufferedReader stdInput = new BufferedReader(new
InputStreamReader(proc.getInputStream()));
new Thread(() -> {
try {
String line;
while((line = stdInput.readLine()) != null) {
synchronized (System.out) {
System.out.println(path + sep + "Output" + sep + line + sep + "----------" + sep);
}
}
} catch (IOException e) {
e.printStackTrace();
}
}).start();
BufferedReader stdError = new BufferedReader(new
InputStreamReader(proc.getErrorStream()));
new Thread(() -> {
try {
String line;
while((line = stdError.readLine()) != null) {
synchronized (System.out) {
System.out.println(path + sep + "Error" + sep + line + sep + "----------" + sep);
}
}
} catch (IOException e) {
e.printStackTrace();
}
}).start();
}
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }