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

Side by Side Diff: runtime/bin/vmservice/server.dart

Issue 2793603002: Nicer message when attempting to use Observatory from dart_bootstrap, dart_precompiled_runtime or a… (Closed)
Patch Set: Created 3 years, 8 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | runtime/lib/vmservice_patch.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 part of vmservice_io; 5 part of vmservice_io;
6 6
7 final bool silentObservatory = const bool.fromEnvironment('SILENT_OBSERVATORY'); 7 final bool silentObservatory = const bool.fromEnvironment('SILENT_OBSERVATORY');
8 8
9 void serverPrint(String s) { 9 void serverPrint(String s) {
10 if (silentObservatory) { 10 if (silentObservatory) {
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 return; 289 return;
290 } 290 }
291 291
292 if (path == WEBSOCKET_PATH) { 292 if (path == WEBSOCKET_PATH) {
293 WebSocketTransformer.upgrade(request).then((WebSocket webSocket) { 293 WebSocketTransformer.upgrade(request).then((WebSocket webSocket) {
294 new WebSocketClient(webSocket, _service); 294 new WebSocketClient(webSocket, _service);
295 }); 295 });
296 return; 296 return;
297 } 297 }
298 298
299 if (assets == null) {
300 request.response.headers.contentType = ContentType.TEXT;
301 request.response.write("This VM was built without the Observatory UI.");
302 request.response.close();
303 return;
304 }
299 Asset asset = assets[path]; 305 Asset asset = assets[path];
300 if (asset != null) { 306 if (asset != null) {
301 // Serving up a static asset (e.g. .css, .html, .png). 307 // Serving up a static asset (e.g. .css, .html, .png).
302 request.response.headers.contentType = ContentType.parse(asset.mimeType); 308 request.response.headers.contentType = ContentType.parse(asset.mimeType);
303 request.response.add(asset.data); 309 request.response.add(asset.data);
304 request.response.close(); 310 request.response.close();
305 return; 311 return;
306 } 312 }
307 // HTTP based service request. 313 // HTTP based service request.
308 try { 314 try {
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 _server = null; 415 _server = null;
410 serverPrint('Could not shutdown Observatory HTTP server:\n$e\n$st\n'); 416 serverPrint('Could not shutdown Observatory HTTP server:\n$e\n$st\n');
411 _notifyServerState(""); 417 _notifyServerState("");
412 onServerAddressChange(null); 418 onServerAddressChange(null);
413 return this; 419 return this;
414 }); 420 });
415 } 421 }
416 } 422 }
417 423
418 void _notifyServerState(String uri) native "VMServiceIO_NotifyServerState"; 424 void _notifyServerState(String uri) native "VMServiceIO_NotifyServerState";
OLDNEW
« no previous file with comments | « no previous file | runtime/lib/vmservice_patch.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698