Add a helper function to ensure we have the correct datastore installed

app/bin/server.dart

 // Copyright (c) 2014, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:appengine/appengine.dart';
 import 'package:gcloud/db.dart';
 import 'package:gcloud/service_scope.dart';
@@ skipping 11 matching lines @@
 import 'package:pub_dartlang_org/templates.dart';
 import 'package:pub_dartlang_org/upload_signer_service.dart';
 
 import 'configuration.dart';
 import 'server_common.dart';
 
 void main() {
   useLoggingPackageAdaptor();
 
   withAppEngineServices(() async {
-    return fork(() async {
-      DatastoreDB savedDb;
-      if (Platform.isMacOS) {
-        savedDb = await initializeApiaryDatastore();
-      }
+    return withCorrectDatastore((DatastoreDB savedDb) async {
       final shelf.Handler apiHandler = await setupServices(activeConfiguration);
 
-      var requestHandler = (HttpRequest ioRequest) async {
-        if (context.isProductionEnvironment &&
-            ioRequest.requestedUri.scheme != 'https') {
-          final secureUri = ioRequest.requestedUri.replace(scheme: 'https');
-          ioRequest.response
-            ..redirect(secureUri)
-            ..close();
-        } else {
-          try {
-            return shelf_io.handleRequest(ioRequest,
-                (shelf.Request request) async {
-              logger.info('Handling request: ${request.requestedUri}');
-              await registerLoggedInUserIfPossible(request);
-              try {
-                final sanitizedRequest = sanitizeRequestedUri(request);
-                return await appHandler(sanitizedRequest, apiHandler);
-              } catch (error, s) {
-                logger.severe('Request handler failed', error, s);
-                return new shelf.Response.internalServerError();
-              } finally {
-                logger.info('Request handler done.');
-              }
-            });
-          } catch (error, stack) {
-            logger.severe('Request handler failed', error, stack);
+      await runAppEngine((HttpRequest ioRequest) async {
+        return withCorrectDatastore((_) {
+          if (context.isProductionEnvironment &&
+              ioRequest.requestedUri.scheme != 'https') {
+            final secureUri = ioRequest.requestedUri.replace(scheme: 'https');
+            ioRequest.response
+              ..redirect(secureUri)
+              ..close();
+          } else {
+            try {
+              return shelf_io.handleRequest(ioRequest,
+                  (shelf.Request request) async {
+                logger.info('Handling request: ${request.requestedUri}');
+                await registerLoggedInUserIfPossible(request);
+                try {
+                  final sanitizedRequest = sanitizeRequestedUri(request);
+                  return await appHandler(sanitizedRequest, apiHandler);
+                } catch (error, s) {
+                  logger.severe('Request handler failed', error, s);
+                  return new shelf.Response.internalServerError();
+                } finally {
+                  logger.info('Request handler done.');
+                }
+              });
+            } catch (error, stack) {
+              logger.severe('Request handler failed', error, stack);
+            }
           }
-        }
-      };
-      if (Platform.isMacOS) {
-        final origHandler = requestHandler;
-        requestHandler = (ioRequest) {
-          fork(() async {
-            registerDbService(savedDb);
-            await origHandler(ioRequest);
-          });
-        };
-      }
-      await runAppEngine(requestHandler);
-    });
+        }, savedDb);
+      });
+    }, null);
   });
 }
 
 Future<shelf.Handler> setupServices(Configuration configuration) async {
   registerTemplateService(
       new TemplateService(templateDirectory: TemplateLocation));
 
   final bucket = storageService.bucket(configuration.packageBucketName);
   final tarballStorage = new TarballStorage(storageService, bucket, null);
   registerTarballStorage(tarballStorage);
@@ skipping 39 matching lines @@
     //  "GET //api/..." :-/ )
     final changedUri = uri.replace(path: normalizedResource);
     return new shelf.Request(request.method, changedUri,
         protocolVersion: request.protocolVersion,
         headers: request.headers,
         body: request.read(),
         encoding: request.encoding,
         context: request.context);
   }
 }