Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(913)

Unified Diff: pkg/analysis_server/lib/src/server/http_server.dart

Issue 2530273004: Status page for the new analysis driver. (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: pkg/analysis_server/lib/src/server/http_server.dart
diff --git a/pkg/analysis_server/lib/src/server/http_server.dart b/pkg/analysis_server/lib/src/server/http_server.dart
index 85aabeafbf225f7cd3e889c9b9c6649a3a447673..e43617bcaae0ab836139754930fa4efb6fb00b97 100644
--- a/pkg/analysis_server/lib/src/server/http_server.dart
+++ b/pkg/analysis_server/lib/src/server/http_server.dart
@@ -10,6 +10,7 @@ import 'dart:io';
import 'package:analysis_server/src/channel/web_socket_channel.dart';
import 'package:analysis_server/src/socket_server.dart';
import 'package:analysis_server/src/status/get_handler.dart';
+import 'package:analysis_server/src/status/get_handler2.dart';
/**
* Instances of the class [HttpServer] implement a simple HTTP server. The
@@ -31,7 +32,7 @@ class HttpAnalysisServer {
/**
* An object that can handle GET requests.
*/
- GetHandler getHandler;
+ Object getHandler;
Paul Berry 2016/11/27 23:16:17 How about if we make a common base class that both
scheglov 2016/11/28 16:28:43 Done.
/**
* Future that is completed with the HTTP server once it is running.
@@ -78,9 +79,17 @@ class HttpAnalysisServer {
*/
void _handleGetRequest(HttpRequest request) {
if (getHandler == null) {
- getHandler = new GetHandler(socketServer, _printBuffer);
+ if (socketServer.analysisServer.options.enableNewAnalysisDriver) {
+ getHandler = new GetHandler2(socketServer, _printBuffer);
+ } else {
+ getHandler = new GetHandler(socketServer, _printBuffer);
+ }
+ }
+ if (getHandler is GetHandler2) {
Paul Berry 2016/11/27 23:16:17 Then we wouldn't need this if-test
scheglov 2016/11/28 16:28:43 Done.
+ (getHandler as GetHandler2).handleGetRequest(request);
+ } else if (getHandler is GetHandler) {
+ (getHandler as GetHandler).handleGetRequest(request);
}
Paul Berry 2016/11/27 23:16:17 If we do keep the if-test, I'd prefer to have a fi
- getHandler.handleGetRequest(request);
}
/**

Powered by Google App Engine
This is Rietveld 408576698