speed tweaks

branch-app · Oct 10, 2014 · b95f1c0 · b95f1c0
1 parent e8208f0
commit b95f1c0
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 6 deletions.
diff --git a/Branch.App/Controllers/SearchController.cs b/Branch.App/Controllers/SearchController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Web;
 using System.Web.Mvc;
 using Branch.App.Models;
 
@@ -11,13 +12,13 @@ public class SearchController : Controller
 		public ActionResult Index(string q)
 		{
 			if (String.IsNullOrEmpty(q))
-				throw new ArgumentException("yo, query can't be null/empty");
+				throw new HttpException(404, "yo, query can't be null/empty");
 
 			// find halo 4 players
-			var halo4ServiceRecord = GlobalStorage.H4Manager.GetPlayerServiceRecord(q);
+			var halo4ServiceRecord = GlobalStorage.H4Manager.GetPlayerServiceRecord(q, true);
 
 			// find halo reach players
-			var haloReachServiceRecord = GlobalStorage.HReachManager.GetPlayerServiceRecord(q);
+			var haloReachServiceRecord = GlobalStorage.HReachManager.GetPlayerServiceRecord(q, true);
 
 			// le render le model le
 			return View(new SearchViewModel(q, halo4ServiceRecord, haloReachServiceRecord));

diff --git a/Branch.App/Web.config b/Branch.App/Web.config
@@ -33,6 +33,11 @@
 			<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
 		</handlers>
 	</system.webServer>
+	<system.net>
+		<connectionManagement>
+			<add address="*" maxconnection="1000" />
+		</connectionManagement>
+	</system.net>
 	<runtime>
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>

diff --git a/Branch.Azure/ServiceDefinition.csdef b/Branch.Azure/ServiceDefinition.csdef
@@ -9,12 +9,13 @@
       <Setting name="SendGridPass" />
       <Setting name="SendGridTo" />
       <Setting name="StorageConnectionString" />
+      <Setting name="SqlServerConnectionString" />
       <Setting name="SpartanTokenApi" />
     </ConfigurationSettings>
     <LocalResources>
     </LocalResources>
   </WorkerRole>
-  <WebRole name="Branch.App" vmsize="Small">
+  <WebRole name="Branch.App" vmsize="Medium">
     <Sites>
       <Site name="Web">
         <Bindings>
@@ -33,6 +34,7 @@
       <Setting name="SendGridPass" />
       <Setting name="SendGridTo" />
       <Setting name="StorageConnectionString" />
+      <Setting name="SqlServerConnectionString" />
       <Setting name="SpartanTokenApi" />
     </ConfigurationSettings>
     <LocalResources>

diff --git a/Branch.Core.Game.Halo4/Api/Manager.cs b/Branch.Core.Game.Halo4/Api/Manager.cs
@@ -135,8 +135,9 @@ public void GetChallenges()
 		/// Gets a Players Halo 4 Service Record
 		/// </summary>
 		/// <param name="gamertag">The players Xbox 360 Gamertag.</param>
+		/// <param name="takeCachedVersion">Tries to take the cached version. If no cached version is avaiable, gets from server.</param>
 		/// <returns>The raw JSON of their Service Record</returns>
-		public ServiceRecord GetPlayerServiceRecord(string gamertag)
+		public ServiceRecord GetPlayerServiceRecord(string gamertag, bool takeCachedVersion = false)
 		{
 			const BlobType blobType = BlobType.PlayerServiceRecord;
 			var escapedGamertag = EscapeGamertag(gamertag);
@@ -147,6 +148,10 @@ public ServiceRecord GetPlayerServiceRecord(string gamertag)
 			// Check if blob exists & expire date
 			if (blobValidity.Item1) return blobValidity.Item2;
 
+			// Do we take the cached version?
+			if (takeCachedVersion && blobValidity.Item2 != null)
+				return blobValidity.Item2;
+
 			// Try and get new blob
 			var url = PopulateUrl(UrlFromIds(EndpointType.ServiceList, "GetServiceRecord"),
 				new Dictionary<string, string> {{"gamertag", gamertag}});

diff --git a/Branch.Core.Game.HaloReach/Api/Manager.cs b/Branch.Core.Game.HaloReach/Api/Manager.cs
@@ -64,8 +64,9 @@ public void GetMetadata()
 		/// Gets a Players Halo: Reach Service Record
 		/// </summary>
 		/// <param name="gamertag">The players Xbox 360 Gamertag.</param>
+		/// <param name="takeCachedVersion">Tries to take the cached version. If no cached version is avaiable, gets from server.</param>
 		/// <returns>Retuens a <see cref="ServiceRecord"/> model.</returns>
-		public ServiceRecord GetPlayerServiceRecord(string gamertag)
+		public ServiceRecord GetPlayerServiceRecord(string gamertag, bool takeCachedVersion = false)
 		{
 			const BlobType blobType = BlobType.PlayerServiceRecord;
 			var escapedGamertag = EscapeGamertag(gamertag);
@@ -76,6 +77,10 @@ public ServiceRecord GetPlayerServiceRecord(string gamertag)
 			// Check if blob exists & expire date
 			if (blobValidity.Item1) return blobValidity.Item2;
 
+			// Do we take the cached version?
+			if (takeCachedVersion && blobValidity.Item2 != null)
+				return blobValidity.Item2;
+
 			// Try and get new blob
 			var endpoint = String.Format("player/details/byplaylist/{0}/{1}", ApiKey, gamertag);
 			var serviceRecordRaw = ValidateResponseAndGetRawText(UnauthorizedRequest(endpoint));