jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Permissions & Authorization for Users #24

Browse Source 
Initial Release; Includes Database and MVC refactoring
This commit is contained in:
Gary Sharp
2013-10-10 19:13:16 +11:00
parent 172ce5524a
commit a099d68915
458 changed files with 40221 additions and 12130 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Logging/LogContext.cs
+14 -14
View File
@@ -70,10 +70,10 @@ namespace Disco.Services.Logging
}
}
private static void InitalizeDatabase(Targets.LogPersistContext logDbContext)
private static void InitalizeDatabase(Targets.LogPersistContext LogDatabase)
{
// Add Modules
var existingModules = logDbContext.Modules.Include("EventTypes").ToDictionary(m => m.Id);
var existingModules = LogDatabase.Modules.Include("EventTypes").ToDictionary(m => m.Id);
foreach (var module in LogModules)
{
// Update/Insert Module
@@ -95,7 +95,7 @@ namespace Disco.Services.Logging
Name = module.Value.ModuleName,
Description = module.Value.ModuleDescription
};
logDbContext.Modules.Add(dbModule);
LogDatabase.Modules.Add(dbModule);
}
// Update/Insert Event Types
Dictionary<int, Models.LogEventType> existingEventTypes = (dbModule.EventTypes == null) ? new Dictionary<int, Models.LogEventType>() : dbModule.EventTypes.ToDictionary(et => et.Id);
@@ -123,17 +123,17 @@ namespace Disco.Services.Logging
Severity = eventType.Value.Severity,
Format = eventType.Value.Format
};
logDbContext.EventTypes.Add(dbEventType);
LogDatabase.EventTypes.Add(dbEventType);
}
}
}
logDbContext.SaveChanges();
LogDatabase.SaveChanges();
}
public static string LogFileBasePath(DiscoDataContext DiscoContext)
public static string LogFileBasePath(DiscoDataContext Database)
{
var logDirectoryBase = Path.Combine(DiscoContext.DiscoConfiguration.DataStoreLocation, "Logs");
var logDirectoryBase = Path.Combine(Database.DiscoConfiguration.DataStoreLocation, "Logs");
// Create Directory Structure
if (!Directory.Exists(logDirectoryBase))
{
@@ -155,9 +155,9 @@ namespace Disco.Services.Logging
return logDirectoryBase;
}
public static string LogFilePath(DiscoDataContext DiscoContext, DateTime Date, bool CreateDirectory = true)
public static string LogFilePath(DiscoDataContext Database, DateTime Date, bool CreateDirectory = true)
{
var logDirectoryBase = LogFileBasePath(DiscoContext);
var logDirectoryBase = LogFileBasePath(Database);
var logDirectory = Path.Combine(logDirectoryBase, Date.Year.ToString());
if (CreateDirectory && !Directory.Exists(logDirectory))
{
@@ -167,11 +167,11 @@ namespace Disco.Services.Logging
return Path.Combine(logDirectory, logFileName);
}
internal static void ReInitalize(DiscoDataContext DiscoContext)
internal static void ReInitalize(DiscoDataContext Database)
{
lock (_CurrentLock)
{
var logPath = LogFilePath(DiscoContext, DateTime.Today);
var logPath = LogFilePath(Database, DateTime.Today);
//var connectionString = string.Format("Data Source=\"{0}\"", logPath);
@@ -204,7 +204,7 @@ namespace Disco.Services.Logging
try
{
// Get Yesterdays Log
var yesterdaysLogPath = LogFilePath(DiscoContext, DateTime.Today.AddDays(-1), false);
var yesterdaysLogPath = LogFilePath(Database, DateTime.Today.AddDays(-1), false);
if (File.Exists(yesterdaysLogPath))
{
SqlCeConnectionStringBuilder sqlCeCSB = new SqlCeConnectionStringBuilder();
@@ -229,9 +229,9 @@ namespace Disco.Services.Logging
}
private static IScheduler _ReInitializeScheduler;
public static void Initalize(DiscoDataContext DiscoContext, ISchedulerFactory SchedulerFactory)
public static void Initalize(DiscoDataContext Database, ISchedulerFactory SchedulerFactory)
{
ReInitalize(DiscoContext);
ReInitalize(Database);
_ReInitializeScheduler = SchedulerFactory.GetScheduler();
Disco.Services/Logging/LogReInitalizeJob.cs
+2 -2
View File
@@ -11,9 +11,9 @@ namespace Disco.Services.Logging
{
public void Execute(IJobExecutionContext context)
{
using (DiscoDataContext DiscoContext = new DiscoDataContext())
using (DiscoDataContext database = new DiscoDataContext())
{
LogContext.ReInitalize(DiscoContext);
LogContext.ReInitalize(database);
}
}
}
Disco.Services/Logging/ReadLogContext.cs
+5 -5
View File
@@ -29,14 +29,14 @@ namespace Disco.Services.Logging
return true;
}
public List<Models.LogLiveEvent> Query(DiscoDataContext DiscoContext)
public List<Models.LogLiveEvent> Query(DiscoDataContext Database)
{
List<Models.LogLiveEvent> results = new List<LogLiveEvent>();
// Validate Options
this.Validate();
var relevantLogFiles = RelevantLogFiles(DiscoContext);
var relevantLogFiles = RelevantLogFiles(Database);
relevantLogFiles.Reverse();
foreach (var logFile in relevantLogFiles)
{
@@ -73,10 +73,10 @@ namespace Disco.Services.Logging
}
}
private List<Tuple<string, DateTime>> RelevantLogFiles(DiscoDataContext DiscoContext)
private List<Tuple<string, DateTime>> RelevantLogFiles(DiscoDataContext Database)
{
List<Tuple<string, DateTime>> relevantFiles = new List<Tuple<string, DateTime>>();
var logDirectoryBase = LogContext.LogFileBasePath(DiscoContext);
var logDirectoryBase = LogContext.LogFileBasePath(Database);
var logDirectoryBaseInfo = new DirectoryInfo(logDirectoryBase);
var endDate = this.End.HasValue ? this.End.Value : DateTime.Now;
var endDateYear = endDate.Year.ToString();
@@ -91,7 +91,7 @@ namespace Disco.Services.Logging
var queryDate = this.Start.Value.Date;
while (queryDate <= endDate)
{
var fileName = LogContext.LogFilePath(DiscoContext, queryDate, false);
var fileName = LogContext.LogFilePath(Database, queryDate, false);
if (File.Exists(fileName))
relevantFiles.Add(new Tuple<string, DateTime>(fileName, LogFileDate(fileName).Value));