diff --git a/nginx-map/wp-nginx-map-json.php b/nginx-map/wp-nginx-map-json.php index 828efa470b70dd37ec1400ba2eed5e2fbd141425..a5415fcc5654d02e600941e4f64f2ccc9132706e 100644 --- a/nginx-map/wp-nginx-map-json.php +++ b/nginx-map/wp-nginx-map-json.php @@ -25,14 +25,14 @@ function backend_to_shard_id($backend) { // Print the blog -> shard_id map. function generate_shard_map($blogs) { global $wpdb; - $wpdb_hash = &$wpdb->hash_map; + global $r2db_hash_map; $shard_map = array(); foreach ($blogs as $blog) { $blog_id = $blog->blog_id; if ($blog_id == 1) continue; - $backend_id = $wpdb_hash->lookup($blog_id); + $backend_id = $r2db_hash_map->lookup($blog_id); $shard_id = backend_to_shard_id($backend_id); $shard_map[$blog->domain] = $shard_id; } diff --git a/nginx-map/wp-nginx-map.php b/nginx-map/wp-nginx-map.php index bf2472cb0b8d486a637999af2d60ced32d9c39d8..2fef72fad83a52e5d77b8dcc5077f7e9e396d752 100644 --- a/nginx-map/wp-nginx-map.php +++ b/nginx-map/wp-nginx-map.php @@ -38,8 +38,8 @@ function backend_to_http_endpoint($backend) { // Print the blog -> backend map. function generate_backend_map($blogs) { global $wpdb; + global $r2db_hash_map; global $noblogs_master; - $wpdb_hash = &$wpdb->hash_map; printline('map $http_host $backend_noblogs {'); printline(' default http://' . $noblogs_master . ':' . NOBLOGS_PORT . ';'); @@ -47,7 +47,7 @@ function generate_backend_map($blogs) { $blog_id = $blog->blog_id; if ($blog_id == 1) continue; - $backend_id = $wpdb_hash->lookup($blog_id); + $backend_id = $r2db_hash_map->lookup($blog_id); $backend_http = backend_to_http_endpoint($backend_id); printline(' ' . $blog->domain . ' http://' . $backend_http . ';'); }