diff --git a/Disco.BI/Properties/AssemblyInfo.cs b/Disco.BI/Properties/AssemblyInfo.cs index 68ba3b30..36273e05 100644 --- a/Disco.BI/Properties/AssemblyInfo.cs +++ b/Disco.BI/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1423")] +[assembly: AssemblyFileVersion("1.2.0513.1423")] \ No newline at end of file diff --git a/Disco.Client/Properties/AssemblyInfo.cs b/Disco.Client/Properties/AssemblyInfo.cs index 675a292b..ecc40210 100644 --- a/Disco.Client/Properties/AssemblyInfo.cs +++ b/Disco.Client/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1423")] +[assembly: AssemblyFileVersion("1.2.0513.1423")] \ No newline at end of file diff --git a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs index 914ffec4..0420e515 100644 --- a/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs +++ b/Disco.ClientBootstrapper/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1423")] +[assembly: AssemblyFileVersion("1.2.0513.1423")] \ No newline at end of file diff --git a/Disco.Data/Properties/AssemblyInfo.cs b/Disco.Data/Properties/AssemblyInfo.cs index 097df3a4..d67af2e6 100644 --- a/Disco.Data/Properties/AssemblyInfo.cs +++ b/Disco.Data/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0514.1205")] +[assembly: AssemblyFileVersion("1.2.0514.1205")] \ No newline at end of file diff --git a/Disco.Models/Properties/AssemblyInfo.cs b/Disco.Models/Properties/AssemblyInfo.cs index 58b2b4d6..d7ea0617 100644 --- a/Disco.Models/Properties/AssemblyInfo.cs +++ b/Disco.Models/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0514.1205")] +[assembly: AssemblyFileVersion("1.2.0514.1205")] \ No newline at end of file diff --git a/Disco.Services/Disco.Services.csproj b/Disco.Services/Disco.Services.csproj index ebcc63fb..20f7116b 100644 --- a/Disco.Services/Disco.Services.csproj +++ b/Disco.Services/Disco.Services.csproj @@ -91,6 +91,7 @@ + @@ -152,7 +153,7 @@ - + diff --git a/Disco.Services/Logging/Models/LogEvent.cs b/Disco.Services/Logging/Models/LogEvent.cs index fe279a0e..eb8b3894 100644 --- a/Disco.Services/Logging/Models/LogEvent.cs +++ b/Disco.Services/Logging/Models/LogEvent.cs @@ -18,6 +18,7 @@ namespace Disco.Services.Logging.Models public int EventTypeId { get; set; } [Required] public DateTime Timestamp { get; set; } + [Column(TypeName="ntext"), MaxLength] public string Arguments { get; set; } } } diff --git a/Disco.Services/Logging/Models/LogLiveEvent.cs b/Disco.Services/Logging/Models/LogLiveEvent.cs index 017f216a..578fc4ea 100644 --- a/Disco.Services/Logging/Models/LogLiveEvent.cs +++ b/Disco.Services/Logging/Models/LogLiveEvent.cs @@ -27,12 +27,7 @@ namespace Disco.Services.Logging.Models object[] Arguments = null; if (jsonArguments != null) { - //var alArguments = fastJSON.JSON.Instance.Parse(jsonArguments) as ArrayList; // Old fastJSON Implementation Arguments = JsonConvert.DeserializeObject(jsonArguments); - //if (alArguments != null) - //{ - // Arguments = alArguments.ToArray(); - //} } return Create(logModule, eventType, Timestamp, Arguments); } diff --git a/Disco.Services/Logging/Targets/LogPersistContext.cs b/Disco.Services/Logging/Targets/LogPersistContext.cs index ac99b87b..4f305f96 100644 --- a/Disco.Services/Logging/Targets/LogPersistContext.cs +++ b/Disco.Services/Logging/Targets/LogPersistContext.cs @@ -11,13 +11,13 @@ namespace Disco.Services.Logging.Targets { public LogPersistContext(string ConnectionString) : base(ConnectionString) { } + static LogPersistContext() + { + Database.SetInitializer(new LogPersistContextInitializer()); + } + public DbSet Modules { get; set; } public DbSet EventTypes { get; set; } public DbSet Events { get; set; } - - protected override void OnModelCreating(DbModelBuilder modelBuilder) - { - //modelBuilder.Conventions.Remove(); - } } } diff --git a/Disco.Services/Logging/Targets/LogPersistContextInitializer.cs b/Disco.Services/Logging/Targets/LogPersistContextInitializer.cs new file mode 100644 index 00000000..1f56cb26 --- /dev/null +++ b/Disco.Services/Logging/Targets/LogPersistContextInitializer.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Data.Entity; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Disco.Services.Logging.Targets +{ + public class LogPersistContextInitializer : IDatabaseInitializer + { + public void InitializeDatabase(LogPersistContext context) + { + if (!context.Database.Exists()) + { + context.Database.Create(); + } + } + } +} diff --git a/Disco.Services/Properties/AssemblyInfo.cs b/Disco.Services/Properties/AssemblyInfo.cs index 52d474f8..a760cbb9 100644 --- a/Disco.Services/Properties/AssemblyInfo.cs +++ b/Disco.Services/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0514.1205")] +[assembly: AssemblyFileVersion("1.2.0514.1205")] \ No newline at end of file diff --git a/Disco.Web.Extensions/Properties/AssemblyInfo.cs b/Disco.Web.Extensions/Properties/AssemblyInfo.cs index 2f2543b4..8026400f 100644 --- a/Disco.Web.Extensions/Properties/AssemblyInfo.cs +++ b/Disco.Web.Extensions/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 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("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1423")] +[assembly: AssemblyFileVersion("1.2.0513.1423")] \ No newline at end of file diff --git a/Disco.Web/Properties/AssemblyInfo.cs b/Disco.Web/Properties/AssemblyInfo.cs index 555f62ba..719225a7 100644 --- a/Disco.Web/Properties/AssemblyInfo.cs +++ b/Disco.Web/Properties/AssemblyInfo.cs @@ -31,5 +31,5 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.2.0513.1342")] -[assembly: AssemblyFileVersion("1.2.0513.1342")] \ No newline at end of file +[assembly: AssemblyVersion("1.2.0513.1423")] +[assembly: AssemblyFileVersion("1.2.0513.1423")] \ No newline at end of file