Patch by tawee80 for custom log location detection

hasankhan · May 18, 2014 · 74832ad · 74832ad
1 parent f14cbca
commit 74832ad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/SharePointLogViewer/Properties/AssemblyInfo.cs b/SharePointLogViewer/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.6.2.0")]
-[assembly: AssemblyFileVersion("2.6.2.0")]
+[assembly: AssemblyVersion("2.6.3.0")]
+[assembly: AssemblyFileVersion("2.6.3.0")]
diff --git a/SharePointLogViewer/SPUtility.cs b/SharePointLogViewer/SPUtility.cs
@@ -139,10 +139,13 @@ public static ICollection TraceSeverities
         public static string GetLogsLocation()
         {
             string logLocation = String.Empty;
+
             if (IsWSSInstalled)
             {
                 logLocation = GetSPDiagnosticsLogLocation();
-                if (logLocation == String.Empty)
+                if (String.IsNullOrEmpty(logLocation))
+                    logLocation = GetCustomLogLocation();
+                if (String.IsNullOrEmpty(logLocation))
                     logLocation = GetStandardLogLocation();
             }
 
@@ -232,6 +235,21 @@ private static string GetStandardLogLocation()
             return logLocation;
         }
 
+        static string GetCustomLogLocation()
+        {
+            string logLocation = String.Empty;
+            try
+            {
+                using (RegistryKey key = GetWSSRegistryKey())
+                    if (key != null)
+                        using (RegistryKey subKey = key.OpenSubKey("WSS"))
+                            if (subKey != null)
+                                logLocation = subKey.GetValue("LogDir") as string;
+            }
+            catch (SecurityException) { }
+            return logLocation;
+        }
+
         private static string GetSPDiagnosticsLogLocation()
         {
             string logLocation = String.Empty;
@@ -254,4 +272,4 @@ private static string GetSPDiagnosticsLogLocation()
             return logLocation;
         }
     }
-}
+}