Merge branch 'pr/1703' into dev

NuGet · Nov 4, 2013 · e25edb2 · e25edb2
2 parents 72bee3d + eb33ec4
commit e25edb2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg b/src/NuGetGallery.Cloud/ServiceConfiguration.Local.cscfg
@@ -22,12 +22,14 @@
       <Setting name="Gallery.GoogleAnalyticsPropertyId" value="" />
       <Setting name="Gallery.AzureCdnHost" value="" />
       <Setting name="Gallery.SiteRoot" value="nuget.localtest.me" />
+
       <!-- *************** -->
       <!-- STABLE SETTINGS -->
       <!-- *************** -->
       <!-- Depending on your policy, these likely do not need to vary -->
       <!-- SmtpUri is expected to be of the format: smtps://username:password@host:port. Note that if username contains an "@", you need to URI Encode it! -->
       <Setting name="Gallery.SmtpUri" value="" />
+      <Setting name="Gallery.HasWorker" value="true" />
       <Setting name="Gallery.RequireSSL" value="true" />
       <Setting name="Gallery.StorageType" value="AzureStorage" />
       <Setting name="Gallery.LuceneIndexLocation" value="Temp" />

diff --git a/src/NuGetGallery.Cloud/ServiceDefinition.csdef b/src/NuGetGallery.Cloud/ServiceDefinition.csdef
@@ -18,6 +18,7 @@
       <Setting name="Gallery.AzureCdnHost" />
       <Setting name="Gallery.LuceneIndexLocation" />
       <Setting name="Gallery.GoogleAnalyticsPropertyId" />
+      <Setting name="Gallery.HasWorker" />
     </ConfigurationSettings>
     <Sites>
       <Site name="Web">

diff --git a/src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs b/src/NuGetGallery/Infrastructure/Lucene/LuceneIndexingService.cs
@@ -98,13 +98,13 @@ public void UpdatePackage(Package package)
             }
 
             // Just update the provided package
-            using (Trace.Activity(String.Format(CultureInfo.CurrentCulture, "Updating Lucene Index for: {0} {1} [PackageKey:{2}]", id, version, key)))
+            using (Trace.Activity(String.Format(CultureInfo.CurrentCulture, "Updating Document: {0}", updateTerm.ToString())))
             {
                 EnsureIndexWriter(creatingIndex: false);
                 if (package != null)
                 {
                     var indexEntity = new PackageIndexEntity(package);
-                    Trace.Information(String.Format(CultureInfo.CurrentCulture, "Updating Document: {0}", updateTerm.ToString()));
+                    Trace.Information(String.Format(CultureInfo.CurrentCulture, "Updating Lucene Index for: {0} {1} [PackageKey:{2}]", package.PackageRegistration.Id, package.Version, package.Key));
                     _indexWriter.UpdateDocument(updateTerm, indexEntity.ToDocument());
                 }
                 else