Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Gracefully shutdown ZeppelinServer in test

Browse source
This commit is contained in:
Lee moon soo 2015-06-03 11:06:30 +09:00
parent 80698e9d8d
commit 8b6d3f55da
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
View file

@ -69,7 +69,9 @@ public class ZeppelinServer extends Application {
private SchedulerFactory schedulerFactory;
public static Notebook notebook;
static NotebookServer notebookServer;
public static NotebookServer notebookServer;
public static Server jettyServer;
private InterpreterFactory replFactory;
@ -79,7 +81,7 @@ public class ZeppelinServer extends Application {
ZeppelinConfiguration conf = ZeppelinConfiguration.create();
conf.setProperty("args", args);
final Server jettyServer = setupJettyServer(conf);
jettyServer = setupJettyServer(conf);
notebookServer = setupNotebookServer(conf);
// REST api

5
zeppelin-server/src/test/java/org/apache/zeppelin/rest/AbstractTestRestApi.java
View file

@ -70,7 +70,7 @@ public abstract class AbstractTestRestApi {
return url;
}
static ExecutorService executor = Executors.newSingleThreadExecutor();
static ExecutorService executor;
protected static final Runnable server = new Runnable() {
@Override
public void run() {
@ -86,6 +86,7 @@ public abstract class AbstractTestRestApi {
protected static void startUp() throws Exception {
if (!wasRunning) {
LOG.info("Staring test Zeppelin up...");
executor = Executors.newSingleThreadExecutor();
executor.submit(server);
long s = System.currentTimeMillis();
boolean started = false;
@ -125,6 +126,8 @@ public abstract class AbstractTestRestApi {
protected static void shutDown() throws Exception {
if (!wasRunning) {
LOG.info("Terminating test Zeppelin...");
ZeppelinServer.notebookServer.stop();
ZeppelinServer.jettyServer.stop();
executor.shutdown();
long s = System.currentTimeMillis();