From 94bdc362100a5a8d2ff4ee6372e08593f7dbcb34 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 7 May 2014 13:44:19 -0700 Subject: [PATCH 1/3] pass q key to db methods --- src/NOCQ/DB/RedisDataase.cs | 13 +++++++------ src/NOCQ/DB/RedisQueues.cs | 12 ++++++++++++ src/NOCQ/NOCQ.csproj | 1 + 3 files changed, 20 insertions(+), 6 deletions(-) create mode 100644 src/NOCQ/DB/RedisQueues.cs diff --git a/src/NOCQ/DB/RedisDataase.cs b/src/NOCQ/DB/RedisDataase.cs index 3166e72..8537467 100644 --- a/src/NOCQ/DB/RedisDataase.cs +++ b/src/NOCQ/DB/RedisDataase.cs @@ -9,27 +9,28 @@ namespace NOCQ { public RedisDataase(){} - public static async Task SaveAlert(IAlert alert) + public static async Task SaveAlert(IAlert alert, string q) { - using (var redis = new RedisClientAsync(ConfigurationManager.AppSettings["DBQueueKey"], + using (var redis = new RedisClientAsync(q, Convert.ToInt32(ConfigurationManager.AppSettings["Port"]), Convert.ToInt32(ConfigurationManager.AppSettings["Timeout"]) )) { - await redis.LPush(ConfigurationManager.AppSettings["DBQueueKey"], alert); + await redis.LPush(q, alert); } } - public static async Task GetNextAlert() + public static async Task GetNextAlert(string q) { - using (var redis = new RedisClientAsync(ConfigurationManager.AppSettings["DBQueueKey"], + + using (var redis = new RedisClientAsync(q, Convert.ToInt32(ConfigurationManager.AppSettings["Port"]), Convert.ToInt32(ConfigurationManager.AppSettings["Timeout"]) )) { - var ts = await redis.RPop(ConfigurationManager.AppSettings["DBQueueKey"]); + var ts = await redis.RPop(q); return JsonConvert.DeserializeObject(ts); diff --git a/src/NOCQ/DB/RedisQueues.cs b/src/NOCQ/DB/RedisQueues.cs new file mode 100644 index 0000000..e6c8556 --- /dev/null +++ b/src/NOCQ/DB/RedisQueues.cs @@ -0,0 +1,12 @@ +using System; +using System.Configuration; + +namespace NOCQ +{ + public struct RedisQueues + { + public static string Input = ConfigurationManager.AppSettings["DBQueueInput"]; + public static string Output = ConfigurationManager.AppSettings["DBQueueOutput"]; + } +} + diff --git a/src/NOCQ/NOCQ.csproj b/src/NOCQ/NOCQ.csproj index 6531573..b7fc16f 100644 --- a/src/NOCQ/NOCQ.csproj +++ b/src/NOCQ/NOCQ.csproj @@ -75,6 +75,7 @@ + From df6e4f60952f5d48e535977df83da0de98f1e9a7 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 7 May 2014 13:45:10 -0700 Subject: [PATCH 2/3] json convert as async --- src/NOCQ/DB/RedisDataase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NOCQ/DB/RedisDataase.cs b/src/NOCQ/DB/RedisDataase.cs index 8537467..43b27cb 100644 --- a/src/NOCQ/DB/RedisDataase.cs +++ b/src/NOCQ/DB/RedisDataase.cs @@ -32,7 +32,7 @@ namespace NOCQ { var ts = await redis.RPop(q); - return JsonConvert.DeserializeObject(ts); + return await JsonConvert.DeserializeObjectAsync(ts); } } From e7f27ce1865f7a0f97ef3e7552b6ccb580814c24 Mon Sep 17 00:00:00 2001 From: Tommy Parnell Date: Wed, 7 May 2014 13:49:18 -0700 Subject: [PATCH 3/3] removing unneeded interfaces --- src/NOCQ/DB/RedisDataase.cs | 2 +- src/NOCQ/Model/Alert.cs | 2 +- src/NOCQ/Model/IAlert.cs | 16 ---------------- src/NOCQ/NOCQ.csproj | 3 --- src/NOCQ/Plugins/Email/EmailSettings.cs | 4 ++-- src/NOCQ/Plugins/Email/IEmailSetting.cs | 17 ----------------- src/NOCQ/Plugins/Email/IParseRule.cs | 18 ------------------ src/NOCQ/Plugins/Email/ImapInput.cs | 2 +- src/NOCQ/Plugins/Email/ParseRule.cs | 2 +- 9 files changed, 6 insertions(+), 60 deletions(-) delete mode 100644 src/NOCQ/Model/IAlert.cs delete mode 100644 src/NOCQ/Plugins/Email/IEmailSetting.cs delete mode 100644 src/NOCQ/Plugins/Email/IParseRule.cs diff --git a/src/NOCQ/DB/RedisDataase.cs b/src/NOCQ/DB/RedisDataase.cs index 43b27cb..609e3cc 100644 --- a/src/NOCQ/DB/RedisDataase.cs +++ b/src/NOCQ/DB/RedisDataase.cs @@ -9,7 +9,7 @@ namespace NOCQ { public RedisDataase(){} - public static async Task SaveAlert(IAlert alert, string q) + public static async Task SaveAlert(Alert alert, string q) { using (var redis = new RedisClientAsync(q, Convert.ToInt32(ConfigurationManager.AppSettings["Port"]), diff --git a/src/NOCQ/Model/Alert.cs b/src/NOCQ/Model/Alert.cs index d0fb4a5..226666c 100644 --- a/src/NOCQ/Model/Alert.cs +++ b/src/NOCQ/Model/Alert.cs @@ -2,7 +2,7 @@ using System; namespace NOCQ { - public class Alert : IAlert + public class Alert { public DateTime TimeStamp {get; set;} public string Source {get;set;} diff --git a/src/NOCQ/Model/IAlert.cs b/src/NOCQ/Model/IAlert.cs deleted file mode 100644 index 2de249d..0000000 --- a/src/NOCQ/Model/IAlert.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; - -namespace NOCQ -{ - public interface IAlert - { - DateTime TimeStamp {get; set;} - string Source {get;set;} - string System {get;set;} - string Service {get;set;} - string Data {get;set;} - string Runbook {get; set;} - string Severity {get;set;} - } -} - diff --git a/src/NOCQ/NOCQ.csproj b/src/NOCQ/NOCQ.csproj index b7fc16f..6a64210 100644 --- a/src/NOCQ/NOCQ.csproj +++ b/src/NOCQ/NOCQ.csproj @@ -71,10 +71,7 @@ - - - diff --git a/src/NOCQ/Plugins/Email/EmailSettings.cs b/src/NOCQ/Plugins/Email/EmailSettings.cs index acd6613..295d427 100644 --- a/src/NOCQ/Plugins/Email/EmailSettings.cs +++ b/src/NOCQ/Plugins/Email/EmailSettings.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; namespace NOCQ.Plugins.Email { - public class EmailSettings :IEmailSetting + public class EmailSettings { public string Username {get;set;} public string Password {get;set;} @@ -12,7 +12,7 @@ namespace NOCQ.Plugins.Email public string Folder {get;set;} public bool IsSsl {get;set;} public int Frequency { get; set; } - public IEnumerable ParseRules {get;set;} + public IEnumerable ParseRules {get;set;} } } diff --git a/src/NOCQ/Plugins/Email/IEmailSetting.cs b/src/NOCQ/Plugins/Email/IEmailSetting.cs deleted file mode 100644 index 0ca692b..0000000 --- a/src/NOCQ/Plugins/Email/IEmailSetting.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -namespace NOCQ.Plugins.Email -{ - public interface IEmailSetting - { - string Username {get;set;} - string Password {get;set;} - string Host {get;set;} - int Port {get;set;} - string Folder {get;set;} - bool IsSsl {get;set;} - int Frequency { get; set; } - IEnumerable ParseRules {get;set;} - } -} - diff --git a/src/NOCQ/Plugins/Email/IParseRule.cs b/src/NOCQ/Plugins/Email/IParseRule.cs deleted file mode 100644 index 4d0eedb..0000000 --- a/src/NOCQ/Plugins/Email/IParseRule.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System; - -namespace NOCQ.Plugins.Email -{ - public interface IParseRule - { - string Name { get; set; } - bool Enabled { get; set; } - string From {get;set;} - string Source {get;set;} - string System {get;set;} - string Service {get;set;} - string Data {get;set;} - string Runbook { get; set;} - string Severity {get;set;} - } -} - diff --git a/src/NOCQ/Plugins/Email/ImapInput.cs b/src/NOCQ/Plugins/Email/ImapInput.cs index 95e798a..a1baf39 100644 --- a/src/NOCQ/Plugins/Email/ImapInput.cs +++ b/src/NOCQ/Plugins/Email/ImapInput.cs @@ -16,7 +16,7 @@ namespace NOCQ.Plugins.Email int port { get; set; } bool ssl { get; set; } DateTime lastRun { get; set; } - List parseRules{ get; set; } + List parseRules{ get; set; } public ImapInput (dynamic settings) { diff --git a/src/NOCQ/Plugins/Email/ParseRule.cs b/src/NOCQ/Plugins/Email/ParseRule.cs index 7c89b42..dae3dee 100644 --- a/src/NOCQ/Plugins/Email/ParseRule.cs +++ b/src/NOCQ/Plugins/Email/ParseRule.cs @@ -2,7 +2,7 @@ using System; namespace NOCQ.Plugins.Email { - public class ParseRule : IParseRule + public class ParseRule { public string Name { get; set; } public bool Enabled { get; set; }