#645 Add check that Solr service exist

Sitecore · Nov 25, 2021 · 31b06a3 · 31b06a3
1 parent b2bca99
commit 31b06a3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/SIM.Base/SolrState.cs b/src/SIM.Base/SolrState.cs
@@ -17,7 +17,8 @@ public class SolrState
     public enum CurrentState
     {
       Running,
-      Stopped
+      Stopped,
+      ServiceNotExist
     }
   }
 }
diff --git a/src/SIM.Base/SolrStateResolver.cs b/src/SIM.Base/SolrStateResolver.cs
@@ -16,7 +16,7 @@ public virtual SolrState.CurrentState GetServiceState(string solrServiceName)
 
       if (service == null)
       {
-        return SolrState.CurrentState.Stopped;
+        return SolrState.CurrentState.ServiceNotExist;
       }
 
       if (service.Status != ServiceControllerStatus.Running)

diff --git a/src/SIM.Tool.Windows/Dialogs/GridEditor.xaml.cs b/src/SIM.Tool.Windows/Dialogs/GridEditor.xaml.cs
@@ -182,7 +182,7 @@ private List<SolrState> GetSolrStates()
         // If Solr service is not running, possibly Solr is started using CMD, in this case Solr Url accesibility can be checked
         foreach (SolrState solrState in solrStates)
         {
-          if (solrState.State == SolrState.CurrentState.Stopped && !solrStates.Any(s =>
+          if (solrState.State != SolrState.CurrentState.Running && !solrStates.Any(s =>
             s.State == SolrState.CurrentState.Running && s.Url == solrState.Url))
           {
             solrState.State = solrStateResolver.GetUrlState(solrState.Url);
@@ -226,7 +226,7 @@ private void UpdateDataGridRowColor()
           {
             row.Background = (SolidColorBrush)new BrushConverter().ConvertFrom("#ccffcc");
           }
-          else if (state == SolrState.CurrentState.Stopped)
+          else if (state == SolrState.CurrentState.Stopped || state == SolrState.CurrentState.ServiceNotExist)
           {
             row.Background = (SolidColorBrush)new BrushConverter().ConvertFrom("#f2f2f2");
           }