author | alundblad |
Mon, 21 Sep 2015 11:19:10 +0200 | |
changeset 32799 | ee577901f4bb |
parent 32542 | f4e4f4c4f9f4 |
child 36161 | a025c0619f25 |
permissions | -rw-r--r-- |
25605
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
1 |
/* |
32335 | 2 |
* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. |
25605
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
4 |
* |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
5 |
* This code is free software; you can redistribute it and/or modify it |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
7 |
* published by the Free Software Foundation. Oracle designates this |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
8 |
* particular file as subject to the "Classpath" exception as provided |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
10 |
* |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
15 |
* accompanied this code). |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
16 |
* |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
17 |
* You should have received a copy of the GNU General Public License version |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
20 |
* |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
22 |
* or visit www.oracle.com if you need additional information or have any |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
23 |
* questions. |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
24 |
*/ |
c2d72342fe19
8050408: A few new Java src files for sjavac are missing copyright notices
jjg
parents:
25299
diff
changeset
|
25 |
|
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
26 |
package com.sun.tools.sjavac.client; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
27 |
|
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
28 |
import java.io.BufferedReader; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
29 |
import java.io.File; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
30 |
import java.io.IOException; |
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
31 |
import java.io.InputStreamReader; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
32 |
import java.io.OutputStreamWriter; |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
33 |
import java.io.PrintStream; |
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
34 |
import java.io.PrintWriter; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
35 |
import java.io.Writer; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
36 |
import java.net.InetAddress; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
37 |
import java.net.InetSocketAddress; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
38 |
import java.net.Socket; |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
39 |
import java.util.ArrayList; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
40 |
import java.util.Arrays; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
41 |
import java.util.List; |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
42 |
import java.util.Scanner; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
43 |
|
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
44 |
import com.sun.tools.sjavac.Log; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
45 |
import com.sun.tools.sjavac.Util; |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
46 |
import com.sun.tools.sjavac.options.OptionHelper; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
47 |
import com.sun.tools.sjavac.options.Options; |
32335 | 48 |
import com.sun.tools.sjavac.server.CompilationSubResult; |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
49 |
import com.sun.tools.sjavac.server.PortFile; |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
50 |
import com.sun.tools.sjavac.server.Sjavac; |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
51 |
import com.sun.tools.sjavac.server.SjavacServer; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
52 |
|
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
53 |
/** |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
54 |
* Sjavac implementation that delegates requests to a SjavacServer. |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
55 |
* |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
56 |
* <p><b>This is NOT part of any supported API. |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
57 |
* If you write code that depends on this, you do so at your own risk. |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
58 |
* This code and its internal interfaces are subject to change or |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
59 |
* deletion without notice.</b> |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
60 |
*/ |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
61 |
public class SjavacClient implements Sjavac { |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
62 |
|
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
63 |
// The id can perhaps be used in the future by the javac server to reuse the |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
64 |
// JavaCompiler instance for several compiles using the same id. |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
65 |
private final String id; |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
66 |
private final PortFile portFile; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
67 |
private final String logfile; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
68 |
private final String stdouterrfile; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
69 |
|
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
70 |
// Default keepalive for server is 120 seconds. |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
71 |
// I.e. it will accept 120 seconds of inactivity before quitting. |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
72 |
private final int keepalive; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
73 |
private final int poolsize; |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
74 |
|
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
75 |
// The sjavac option specifies how the server part of sjavac is spawned. |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
76 |
// If you have the experimental sjavac in your path, you are done. If not, you have |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
77 |
// to point to a com.sun.tools.sjavac.Main that supports --startserver |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
78 |
// for example by setting: sjavac=java%20-jar%20...javac.jar%com.sun.tools.sjavac.Main |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
79 |
private final String sjavacForkCmd; |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
80 |
|
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
81 |
// Wait 2 seconds for response, before giving up on javac server. |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
82 |
static int CONNECTION_TIMEOUT = 2000; |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
83 |
static int MAX_CONNECT_ATTEMPTS = 3; |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
84 |
static int WAIT_BETWEEN_CONNECT_ATTEMPTS = 2000; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
85 |
|
26088 | 86 |
// Store the server conf settings here. |
87 |
private final String settings; |
|
88 |
||
32335 | 89 |
public SjavacClient(Options options) throws PortFileInaccessibleException { |
26088 | 90 |
String tmpServerConf = options.getServerConf(); |
91 |
String serverConf = (tmpServerConf!=null)? tmpServerConf : ""; |
|
92 |
String tmpId = Util.extractStringOption("id", serverConf); |
|
93 |
id = (tmpId!=null) ? tmpId : "id"+(((new java.util.Random()).nextLong())&Long.MAX_VALUE); |
|
32799 | 94 |
String defaultPortfile = options.getDestDir() |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
95 |
.resolve("javac_server") |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
96 |
.toAbsolutePath() |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
97 |
.toString(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
98 |
String portfileName = Util.extractStringOption("portfile", serverConf, defaultPortfile); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
99 |
try { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
100 |
portFile = SjavacServer.getPortFile(portfileName); |
32335 | 101 |
} catch (PortFileInaccessibleException e) { |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
102 |
Log.error("Port file inaccessable: " + e); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
103 |
throw e; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
104 |
} |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
105 |
logfile = Util.extractStringOption("logfile", serverConf, portfileName + ".javaclog"); |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
106 |
stdouterrfile = Util.extractStringOption("stdouterrfile", serverConf, portfileName + ".stdouterr"); |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
107 |
sjavacForkCmd = Util.extractStringOption("sjavac", serverConf, "sjavac"); |
26088 | 108 |
int poolsize = Util.extractIntOption("poolsize", serverConf); |
109 |
keepalive = Util.extractIntOption("keepalive", serverConf, 120); |
|
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
110 |
|
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
111 |
this.poolsize = poolsize > 0 ? poolsize : Runtime.getRuntime().availableProcessors(); |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
112 |
settings = (serverConf.equals("")) ? "id="+id+",portfile="+portfileName : serverConf; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
113 |
} |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
114 |
|
26088 | 115 |
/** |
116 |
* Hand out the server settings. |
|
117 |
* @return The server settings, possibly a default value. |
|
118 |
*/ |
|
119 |
public String serverSettings() { |
|
120 |
return settings; |
|
121 |
} |
|
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
122 |
|
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
123 |
@Override |
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
124 |
public int compile(String[] args, Writer stdout, Writer stderr) { |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
125 |
int result = -1; |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
126 |
try (Socket socket = tryConnect()) { |
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
127 |
PrintWriter out = new PrintWriter(new OutputStreamWriter(socket.getOutputStream())); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
128 |
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream())); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
129 |
|
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
130 |
// Send args array to server |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
131 |
out.println(args.length); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
132 |
for (String arg : args) |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
133 |
out.println(arg); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
134 |
out.flush(); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
135 |
|
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
136 |
// Read server response line by line |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
137 |
String line; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
138 |
while (null != (line = in.readLine())) { |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
139 |
String[] typeAndContent = line.split(":", 2); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
140 |
String type = typeAndContent[0]; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
141 |
String content = typeAndContent[1]; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
142 |
switch (type) { |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
143 |
case SjavacServer.LINE_TYPE_STDOUT: |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
144 |
stdout.write(content); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
145 |
stdout.write('\n'); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
146 |
break; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
147 |
case SjavacServer.LINE_TYPE_STDERR: |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
148 |
stderr.write(content); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
149 |
stderr.write('\n'); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
150 |
break; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
151 |
case SjavacServer.LINE_TYPE_RC: |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
152 |
result = Integer.parseInt(content); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
153 |
break; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
154 |
} |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
155 |
} |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
156 |
} catch (IOException ioe) { |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
157 |
Log.error("[CLIENT] Exception caught: " + ioe); |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
158 |
result = CompilationSubResult.ERROR_FATAL; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
159 |
ioe.printStackTrace(new PrintWriter(stderr)); |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
160 |
} catch (InterruptedException ie) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
161 |
Thread.currentThread().interrupt(); // Restore interrupt |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
162 |
Log.error("[CLIENT] compile interrupted."); |
32542
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
163 |
result = CompilationSubResult.ERROR_FATAL; |
f4e4f4c4f9f4
8129114: Sjavac should stream back compiler output to the client as soon as it becomes available
alundblad
parents:
32335
diff
changeset
|
164 |
ie.printStackTrace(new PrintWriter(stderr)); |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
165 |
} |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
166 |
return result; |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
167 |
} |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
168 |
|
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
169 |
/* |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
170 |
* Makes MAX_CONNECT_ATTEMPTS attepmts to connect to server. |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
171 |
*/ |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
172 |
private Socket tryConnect() throws IOException, InterruptedException { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
173 |
makeSureServerIsRunning(portFile); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
174 |
int attempt = 0; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
175 |
while (true) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
176 |
Log.info("Trying to connect. Attempt " + (++attempt) + " of " + MAX_CONNECT_ATTEMPTS); |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
177 |
try { |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
178 |
return makeConnectionAttempt(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
179 |
} catch (IOException ex) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
180 |
Log.error("Connection attempt failed: " + ex.getMessage()); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
181 |
if (attempt >= MAX_CONNECT_ATTEMPTS) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
182 |
Log.error("Giving up"); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
183 |
throw new IOException("Could not connect to server", ex); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
184 |
} |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
185 |
} |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
186 |
Thread.sleep(WAIT_BETWEEN_CONNECT_ATTEMPTS); |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
187 |
} |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
188 |
} |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
189 |
|
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
190 |
private Socket makeConnectionAttempt() throws IOException { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
191 |
Socket socket = new Socket(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
192 |
InetAddress localhost = InetAddress.getByName(null); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
193 |
InetSocketAddress address = new InetSocketAddress(localhost, portFile.getPort()); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
194 |
socket.connect(address, CONNECTION_TIMEOUT); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
195 |
Log.info("Connected"); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
196 |
return socket; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
197 |
} |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
198 |
|
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
199 |
/* |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
200 |
* Will return immediately if a server already seems to be running, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
201 |
* otherwise fork a new server and block until it seems to be running. |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
202 |
*/ |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
203 |
private void makeSureServerIsRunning(PortFile portFile) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
204 |
throws IOException, InterruptedException { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
205 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
206 |
portFile.lock(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
207 |
portFile.getValues(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
208 |
portFile.unlock(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
209 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
210 |
if (portFile.containsPortInfo()) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
211 |
// Server seems to already be running |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
212 |
return; |
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
213 |
} |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
214 |
|
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
215 |
// Fork a new server and wait for it to start |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
216 |
SjavacClient.fork(sjavacForkCmd, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
217 |
portFile, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
218 |
logfile, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
219 |
poolsize, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
220 |
keepalive, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
221 |
System.err, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
222 |
stdouterrfile); |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
223 |
} |
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
224 |
|
26098
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
225 |
@Override |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
226 |
public void shutdown() { |
32588700060b
8048457: Sjavac should not use portfiles, sockets, etc if background=false
alundblad
parents:
26088
diff
changeset
|
227 |
// Nothing to clean up |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
228 |
} |
27383
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
229 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
230 |
/* |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
231 |
* Fork a server process process and wait for server to come around |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
232 |
*/ |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
233 |
public static void fork(String sjavacCmd, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
234 |
PortFile portFile, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
235 |
String logfile, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
236 |
int poolsize, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
237 |
int keepalive, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
238 |
final PrintStream err, |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
239 |
String stdouterrfile) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
240 |
throws IOException, InterruptedException { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
241 |
List<String> cmd = new ArrayList<>(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
242 |
cmd.addAll(Arrays.asList(OptionHelper.unescapeCmdArg(sjavacCmd).split(" "))); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
243 |
cmd.add("--startserver:" |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
244 |
+ "portfile=" + portFile.getFilename() |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
245 |
+ ",logfile=" + logfile |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
246 |
+ ",stdouterrfile=" + stdouterrfile |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
247 |
+ ",poolsize=" + poolsize |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
248 |
+ ",keepalive="+ keepalive); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
249 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
250 |
Process p = null; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
251 |
Log.info("Starting server. Command: " + String.join(" ", cmd)); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
252 |
try { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
253 |
// If the cmd for some reason can't be executed (file not found, or |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
254 |
// is not executable) this will throw an IOException with a decent |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
255 |
// error message. |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
256 |
p = new ProcessBuilder(cmd) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
257 |
.redirectErrorStream(true) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
258 |
.redirectOutput(new File(stdouterrfile)) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
259 |
.start(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
260 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
261 |
// Throws an IOException if no valid values materialize |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
262 |
portFile.waitForValidValues(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
263 |
|
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
264 |
} catch (IOException ex) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
265 |
// Log and rethrow exception |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
266 |
Log.error("Faild to launch server."); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
267 |
Log.error(" Message: " + ex.getMessage()); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
268 |
String rc = p == null || p.isAlive() ? "n/a" : "" + p.exitValue(); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
269 |
Log.error(" Server process exit code: " + rc); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
270 |
Log.error("Server log:"); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
271 |
Log.error("------- Server log start -------"); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
272 |
try (Scanner s = new Scanner(new File(stdouterrfile))) { |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
273 |
while (s.hasNextLine()) |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
274 |
Log.error(s.nextLine()); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
275 |
} |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
276 |
Log.error("------- Server log end ---------"); |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
277 |
throw ex; |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
278 |
} |
716ed9a6d607
8042088: Sjavac spawns external processes in a unnecessarily complex and platform dependent way
alundblad
parents:
27226
diff
changeset
|
279 |
} |
25299
b4a7dcd657f5
8048594: The sjavac client/server protocol should be hidden behind an interface
alundblad
parents:
diff
changeset
|
280 |
} |