don't try restarting dcd after shutdownRequest, shutdown on exit

WebFreak001 · WebFreak001 · commit 5be8531af422 · 2018-04-03T21:42:11.000+02:00
diff --git a/source/app.d b/source/app.d
@@ -106,6 +106,8 @@ void processNotify(RequestMessage msg)
 	if (msg.method == "exit" || served.extension.shutdownRequested)
 	{
 		rpc.stop();
+		if (!served.extension.shutdownRequested)
+			served.extension.shutdown();
 		return;
 	}
 	if (msg.method == "workspace/didChangeConfiguration")
diff --git a/source/served/extension.d b/source/served/extension.d
@@ -245,6 +245,8 @@ void handleBroadcast(JSONValue data)
 
 void startDCD()
 {
+	if (shutdownRequested)
+		return;
 	hasDCD = safe!(dcd.start)(workspaceRoot, config.d.dcdClientPath,
 			config.d.dcdServerPath, cast(ushort) 9166, false);
 	if (hasDCD)

Original file line number	Diff line number	Diff line change
`@@ -106,6 +106,8 @@ void processNotify(RequestMessage msg)`
`106`	`106`	`if (msg.method == "exit" \|\| served.extension.shutdownRequested)`
`107`	`107`	`{`
`108`	`108`	`rpc.stop();`
	`109`	`+ if (!served.extension.shutdownRequested)`
	`110`	`+ served.extension.shutdown();`
`109`	`111`	`return;`
`110`	`112`	`}`
`111`	`113`	`if (msg.method == "workspace/didChangeConfiguration")`
Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,8 @@ void handleBroadcast(JSONValue data)`
`245`	`245`
`246`	`246`	`void startDCD()`
`247`	`247`	`{`
	`248`	`+ if (shutdownRequested)`
	`249`	`+ return;`
`248`	`250`	`hasDCD = safe!(dcd.start)(workspaceRoot, config.d.dcdClientPath,`
`249`	`251`	`config.d.dcdServerPath, cast(ushort) 9166, false);`
`250`	`252`	`if (hasDCD)`