TerribleDev/TimberWinR
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Consolidated key names

Browse Source
This commit is contained in:
Eric Fontana
2014-08-26 11:40:33 -04:00
parent c8a8d47f45
commit 9662f82c18
5 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
TimberWinR.ServiceHost/Program.cs
View File

@@ -21,6 +21,9 @@ namespace TimberWinR.ServiceHost
{ {
internal class Program internal class Program
{ {
const string KeyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
const string KeyName = "ImagePath";
private static void Main(string[] args) private static void Main(string[] args)
{ {
Arguments arguments = new Arguments(); Arguments arguments = new Arguments();
@@ -50,11 +53,8 @@ namespace TimberWinR.ServiceHost
hostConfigurator.SetServiceName("TimberWinR"); hostConfigurator.SetServiceName("TimberWinR");
hostConfigurator.AfterInstall(() => hostConfigurator.AfterInstall(() =>
{ {
const string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR"; var currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
const string keyName = "ImagePath";
var currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
if (!string.IsNullOrEmpty(currentValue)) if (!string.IsNullOrEmpty(currentValue))
{ {
AddServiceParameter("-configFile", arguments.ConfigFile); AddServiceParameter("-configFile", arguments.ConfigFile);
@@ -69,29 +69,25 @@ namespace TimberWinR.ServiceHost
private static void AddServiceParameter(string paramName, string value) private static void AddServiceParameter(string paramName, string value)
{ {
string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
string keyName = "ImagePath"; string currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
string currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0} ", paramName))) if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0} ", paramName)))
{ {
currentValue += string.Format(" {0} \"{1}\"", paramName, value.Replace("\\\\", "\\")); currentValue += string.Format(" {0} \"{1}\"", paramName, value.Replace("\\\\", "\\"));
Registry.SetValue(keyPath, keyName, currentValue); Registry.SetValue(KeyPath, KeyName, currentValue);
} }
} }
private static void AddServiceParameter(string paramName, int value) private static void AddServiceParameter(string paramName, int value)
{ {
string keyPath = @"HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\services\TimberWinR";
string keyName = "ImagePath"; string currentValue = Registry.GetValue(KeyPath, KeyName, "").ToString();
string currentValue = Registry.GetValue(keyPath, keyName, "").ToString();
if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0}:", paramName))) if (!string.IsNullOrEmpty(paramName) && !currentValue.Contains(string.Format("{0}:", paramName)))
{ {
currentValue += string.Format(" {0}:{1}", paramName, value); currentValue += string.Format(" {0}:{1}", paramName, value);
Registry.SetValue(keyPath, keyName, currentValue); Registry.SetValue(KeyPath, KeyName, currentValue);
} }
} }

2
TimberWinR/Diagnostics/Diagnostics.cs
View File

@@ -106,7 +106,7 @@ namespace TimberWinR.Diagnostics
} }
catch (Exception ex) catch (Exception ex)
{ {
LogManager.GetCurrentClassLogger().Error("Tcp Exception", ex); LogManager.GetCurrentClassLogger().Error(ex);
} }
} }

2
TimberWinR/Inputs/InputListener.cs
View File

@@ -70,7 +70,7 @@ namespace TimberWinR.Inputs
} }
catch (Exception ex) catch (Exception ex)
{ {
LogManager.GetCurrentClassLogger().Error("Error Deleting Checkpoint File", ex); LogManager.GetCurrentClassLogger().Error(ex);
} }
} }

2
TimberWinR/Inputs/TcpInputListener.cs
View File

@@ -117,7 +117,7 @@ namespace TimberWinR.Inputs
} }
catch (Exception ex) catch (Exception ex)
{ {
LogManager.GetCurrentClassLogger().Error("Tcp Exception", ex); LogManager.GetCurrentClassLogger().Error(ex);
} }
if (clientStream != null) if (clientStream != null)

2
TimberWinR/Inputs/WindowsEvtInputListener.cs
View File

@@ -116,7 +116,7 @@ namespace TimberWinR.Inputs
} }
catch (Exception ex) catch (Exception ex)
{ {
LogManager.GetCurrentClassLogger().Error("WindowsEventListener", ex); LogManager.GetCurrentClassLogger().Error(ex);
firstQuery = true; firstQuery = true;
oLogQuery = new LogQuery(); oLogQuery = new LogQuery();
} }