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

Tidy: Sort/remove usings, simplify names

Browse Source
This commit is contained in:
Gary Sharp
2017-03-25 15:29:51 +11:00
parent 526f8547f7
commit ed66f4f285
168 changed files with 708 additions and 1175 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Logging/LogBase.cs
+4 -6
View File
@@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Disco.Services.Logging
{
@@ -12,7 +10,7 @@ namespace Disco.Services.Logging
public LogBase()
{
// Cache Event Types
_EventTypes = this.LoadEventTypes().ToDictionary(et => et.Id);
_EventTypes = LoadEventTypes().ToDictionary(et => et.Id);
}
public abstract int ModuleId { get; }
@@ -29,13 +27,13 @@ namespace Disco.Services.Logging
}
protected void Log(int EventTypeId, params object[] Args)
{
LogContext.Current.Log(this.ModuleId, EventTypeId, Args);
LogContext.Current.Log(ModuleId, EventTypeId, Args);
}
public string LiveLogGroupName
{
get
{
return this.ModuleName;
return ModuleName;
}
}
Disco.Services/Logging/LogContext.cs
-6
View File
@@ -1,17 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Disco.Data.Repository;
using System.IO;
using System.Management;
using System.Diagnostics;
using System.Data.SqlServerCe;
using System.Data.EntityClient;
using System.Data.Entity;
using Quartz;
using Quartz.Impl;
using Quartz.Impl.Triggers;
using Newtonsoft.Json;
namespace Disco.Services.Logging
Disco.Services/Logging/LogReInitalizeJob.cs
+1 -5
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Quartz;
using Quartz;
using Disco.Data.Repository;
namespace Disco.Services.Logging
Disco.Services/Logging/Models/LogEvent.cs
-3
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
Disco.Services/Logging/Models/LogEventType.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Linq;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
Disco.Services/Logging/Models/LogLiveEvent.cs
-4
View File
@@ -1,8 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections;
using Newtonsoft.Json;
namespace Disco.Services.Logging.Models
Disco.Services/Logging/Models/LogModule.cs
+1 -4
View File
@@ -1,7 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
Disco.Services/Logging/Persistance/LogPersistContext.cs
+1 -6
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Data.Entity;
using System.Data.Entity.Infrastructure;
using System.Data.Entity;
namespace Disco.Services.Logging.Persistance
{
Disco.Services/Logging/Persistance/LogPersistContextInitializer.cs
+1 -6
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Data.Entity;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Data.Entity;
namespace Disco.Services.Logging.Persistance
{
Disco.Services/Logging/ReadLogContext.cs
+20 -20
View File
@@ -20,9 +20,9 @@ namespace Disco.Services.Logging
public bool Validate()
{
if (this.Start.HasValue && this.End.HasValue && this.End.Value < this.Start.Value)
if (Start.HasValue && End.HasValue && End.Value < Start.Value)
throw new ArgumentOutOfRangeException("End", "End must be greater than Start");
if (this.Start.HasValue && !this.End.HasValue && this.Start > DateTime.Now)
if (Start.HasValue && !End.HasValue && Start > DateTime.Now)
throw new ArgumentOutOfRangeException("Start", "Start must be less than current time");
return true;
@@ -33,7 +33,7 @@ namespace Disco.Services.Logging
List<Models.LogLiveEvent> results = new List<LogLiveEvent>();
// Validate Options
this.Validate();
Validate();
var relevantLogFiles = RelevantLogFiles(Database);
relevantLogFiles.Reverse();
@@ -46,11 +46,11 @@ namespace Disco.Services.Logging
using (var context = new LogPersistContext(sqlCeCSB.ToString()))
{
var query = this.BuildQuery(context, logFile.Item2, results.Count);
var query = BuildQuery(context, logFile.Item2, results.Count);
IEnumerable<LogEvent> queryResults = query; // Run the Query
results.AddRange(queryResults.Select(le => Models.LogLiveEvent.Create(logModules[le.ModuleId], logModules[le.ModuleId].EventTypes[le.EventTypeId], le.Timestamp, le.Arguments)));
}
if (this.Take.HasValue && this.Take.Value < results.Count)
if (Take.HasValue && Take.Value < results.Count)
break;
}
return results;
@@ -77,17 +77,17 @@ namespace Disco.Services.Logging
List<Tuple<string, DateTime>> relevantFiles = new List<Tuple<string, DateTime>>();
var logDirectoryBase = LogContext.LogFileBasePath(Database);
var logDirectoryBaseInfo = new DirectoryInfo(logDirectoryBase);
var endDate = this.End.HasValue ? this.End.Value : DateTime.Now;
var endDate = End.HasValue ? End.Value : DateTime.Now;
var endDateYear = endDate.Year.ToString();
// Try Shortcut ( < 31 Days in Query)
if (this.Start.HasValue)
if (Start.HasValue)
{
if ((this.End.HasValue && this.End.Value.Subtract(this.Start.Value).Days < 31) ||
(!this.End.HasValue && DateTime.Now.Subtract(this.Start.Value).Days < 31))
if ((End.HasValue && End.Value.Subtract(Start.Value).Days < 31) ||
(!End.HasValue && DateTime.Now.Subtract(Start.Value).Days < 31))
{
// Less than 31 Days in Query - Just evaluate each Path
var queryDate = this.Start.Value.Date;
var queryDate = Start.Value.Date;
while (queryDate <= endDate)
{
var fileName = LogContext.LogFilePath(Database, queryDate, false);
@@ -148,27 +148,27 @@ namespace Disco.Services.Logging
private IQueryable<LogEvent> BuildQuery(LogPersistContext LogContext, DateTime LogDate, int Taken)
{
IQueryable<LogEvent> query = LogContext.Events.OrderByDescending(le => le.Timestamp);
if (this.Module.HasValue)
if (Module.HasValue)
{
query = query.Where(le => le.ModuleId == this.Module.Value);
query = query.Where(le => le.ModuleId == Module.Value);
}
if (this.EventTypes != null && this.EventTypes.Count > 0)
if (EventTypes != null && EventTypes.Count > 0)
{
query = query.Where(le => this.EventTypes.Contains(le.EventTypeId));
query = query.Where(le => EventTypes.Contains(le.EventTypeId));
}
if (this.Start.HasValue && this.Start.Value > LogDate)
if (Start.HasValue && Start.Value > LogDate)
{
var startValue = DateTime.SpecifyKind(this.Start.Value, DateTimeKind.Local);
var startValue = DateTime.SpecifyKind(Start.Value, DateTimeKind.Local);
query = query.Where(le => le.Timestamp > startValue);
}
if (this.End.HasValue && this.End.Value <= LogDate.AddDays(1))
if (End.HasValue && End.Value <= LogDate.AddDays(1))
{
var endValue = DateTime.SpecifyKind(this.End.Value, DateTimeKind.Local);
var endValue = DateTime.SpecifyKind(End.Value, DateTimeKind.Local);
query = query.Where(le => le.Timestamp < endValue);
}
if (this.Take.HasValue && this.Take.Value > 0)
if (Take.HasValue && Take.Value > 0)
{
var take = this.Take.Value - Taken;
var take = Take.Value - Taken;
query = query.Take(take);
}
return query;
Disco.Services/Logging/Utilities.cs
-1
View File
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Microsoft.Win32.SafeHandles;
using System.Runtime.InteropServices;
using System.IO;