v2.0 release updates

jgauffin · jgauffin · commit e008c90b60df · 2018-04-20T12:04:29.000+02:00
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Boot/Starters/ReportQueueModule.cs b/src/Server/Coderr.Server.ReportAnalyzer/Boot/Starters/ReportQueueModule.cs
@@ -4,15 +4,13 @@
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using codeRR.Client;
+using Coderr.Client;
 using Coderr.Server.Abstractions.Security;
 using Coderr.Server.Infrastructure.Messaging;
 using Coderr.Server.ReportAnalyzer.Abstractions;
 using Coderr.Server.ReportAnalyzer.Abstractions.Boot;
 using Coderr.Server.ReportAnalyzer.Abstractions.Incidents;
 using Coderr.Server.ReportAnalyzer.Boot.Adapters;
-using Coderr.Server.ReportAnalyzer.Inbound.Commands;
-using Coderr.Server.ReportAnalyzer.Inbound.Handlers;
 using DotNetCqs;
 using DotNetCqs.Bus;
 using DotNetCqs.DependencyInjection;
@@ -109,7 +107,7 @@ private QueueListener ConfigureQueueListener(ConfigurationContext context, strin
             };
             listener.PoisonMessageDetected += (sender, args) =>
             {
-                //Err.Report(args.Exception, new { args.Message });
+                Err.Report(args.Exception, new { args.Message.Body });
                 _logger.Error(inboundQueueName + " Poison message: " + args.Message.Body, args.Exception);
             };
             listener.ScopeCreated += (sender, args) =>
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/Coderr.Server.ReportAnalyzer.csproj b/src/Server/Coderr.Server.ReportAnalyzer/Coderr.Server.ReportAnalyzer.csproj
@@ -6,7 +6,7 @@
     <DefaultItemExcludes>$(DefaultItemExcludes);**\*.DotSettings;</DefaultItemExcludes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Coderr.Client.NetStd" Version="1.0.2" />
+    <PackageReference Include="Coderr.Client.NetStd" Version="1.1.3" />
     <PackageReference Include="DotNetCqs" Version="2.0.9" />
     <PackageReference Include="DotNetCqs.DependencyInjection.Microsoft" Version="1.0.0" />
     <PackageReference Include="DotNetCqs.Queues.AdoNet" Version="1.0.6" />
diff --git a/src/Server/Coderr.Server.ReportAnalyzer/ErrorReports/HashCodeGenerator.cs b/src/Server/Coderr.Server.ReportAnalyzer/ErrorReports/HashCodeGenerator.cs
@@ -64,14 +64,21 @@ protected virtual string DefaultCreateHashCode(ErrorReportEntity report)
         {
             if (report == null) throw new ArgumentNullException("report");
 
-            //TODO: Ta bort radnummers stripparen
-            var hashSource = report.Exception.FullName + "\r\n";
-            hashSource += StripLineNumbers(report.Exception.StackTrace ?? "");
+            
+            var hashSource = $"{report.Exception.FullName ?? report.Exception.Name}\r\n";
+
+            // the client libraries can by themselves specify how we should identify
+            // unqiue incidents. We then use that identifier in combination with the exception name.
+            var collection = report.ContextCollections.FirstOrDefault(x => x.Name == "CoderrData");
+            if (collection != null && collection.Properties.TryGetValue("HashSource", out var reportHashSource))
+                hashSource += reportHashSource;
+            else
+                hashSource += StripLineNumbers(report.Exception.StackTrace ?? "");
 
             var hash = 23;
             foreach (var c in hashSource)
             {
-                hash = hash*31 + c;
+                hash = hash * 31 + c;
             }
             return hash.ToString("X");
         }
diff --git a/src/Server/Coderr.Server.SqlServer/Core/Reports/ErrorReportRepository.cs b/src/Server/Coderr.Server.SqlServer/Core/Reports/ErrorReportRepository.cs
@@ -65,7 +65,7 @@ public async Task<ErrorReportEntity> GetAsync(int id)
                             report.Add(collection);
                         }
 
-                        properties.Add(reader.GetString(1), reader.GetString(2));
+                        properties[reader.GetString(1)] = reader.GetString(2);
                     }
 
                     // When the last property is in a new collection
diff --git a/src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Completed.cshtml b/src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Completed.cshtml
@@ -21,5 +21,6 @@
             </div>
         }
         @Html.Raw(ViewBag.PrevStep)
+        <a href="~/" class="btn btn-primary">I've restarted the pool, let's begin!</a>
     </div>
 </div>
diff --git a/src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Support.cshtml b/src/Server/Coderr.Server.Web/Areas/Installation/Views/Setup/Support.cshtml
@@ -17,7 +17,7 @@
             <div>&nbsp;</div>
             <br />
             @Html.Raw(ViewBag.PrevLink)
-            <input type="submit" class="btn btn-primary" value="Get FREE help" />
+            <input type="submit" class="btn btn-primary" value="Get FREE assistance" />
             @Html.Raw(ViewBag.NextLink)
         </form>
     </div>
diff --git a/src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs b/src/Server/Coderr.Server.Web/Boot/Cqs/RegisterCqsServices.cs
@@ -2,11 +2,10 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Linq;
-using System.Reflection;
 using System.Security.Claims;
 using System.Threading;
 using System.Threading.Tasks;
-using codeRR.Client;
+using Coderr.Client;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Abstractions.Security;
 using Coderr.Server.App.Core.Accounts;
@@ -140,7 +139,7 @@ private IMessageInvoker CreateMessageInvoker(IServiceProvider x)
                 }
                 catch (Exception ex)
                 {
-                    Err.Report(ex, new {args.Message});
+                    Err.Report(ex, new {args.Message.Body});
                 }
             };
 
@@ -160,7 +159,7 @@ private IMessageInvoker CreateMessageInvoker(IServiceProvider x)
 
                 Err.Report(args.Exception, new
                 {
-                    args.Message,
+                    args.Message.Body,
                     HandlerType = args.Handler.GetType(),
                     args.ExecutionTime
                 });
@@ -199,7 +198,7 @@ private IMessageInvoker MessageInvokerFactory(IHandlerScope arg)
 
                 Err.Report(args.Exception, new
                 {
-                    args.Message,
+                    args.Message.Body,
                     HandlerType = args.Handler.GetType(),
                     args.ExecutionTime
                 });
diff --git a/src/Server/Coderr.Server.Web/Boot/Modules/BackgroundJobs.cs b/src/Server/Coderr.Server.Web/Boot/Modules/BackgroundJobs.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 using System.Diagnostics;
-using codeRR.Client;
+using Coderr.Client;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Web.Boot.Adapters;
 using Griffin.ApplicationServices;
diff --git a/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj b/src/Server/Coderr.Server.Web/Coderr.Server.Web.csproj
@@ -7,7 +7,7 @@
     <IsPackable>false</IsPackable>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <TypeScriptExperimentalDecorators>true</TypeScriptExperimentalDecorators>
   </PropertyGroup>
@@ -18,6 +18,7 @@
   </ItemGroup>-->
 
   <ItemGroup>
+    <PackageReference Include="Coderr.Client.AspNetCore.Mvc" Version="1.0.3" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.6" />
     <PackageReference Include="Griffin.Framework" Version="2.0.0-alpha01" />
     <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.3" />
@@ -77,5 +78,4 @@
       </ResolvedFileToPublish>
     </ItemGroup>
   </Target>
-
 </Project>
diff --git a/src/Server/Coderr.Server.Web/Controllers/FeedbackReceiverController.cs b/src/Server/Coderr.Server.Web/Controllers/FeedbackReceiverController.cs
@@ -3,7 +3,7 @@
 using System.IO.Compression;
 using System.Text;
 using System.Threading.Tasks;
-using codeRR.Client.Contracts;
+using Coderr.Client.Contracts;
 using Coderr.Server.Domain.Core.Applications;
 using Coderr.Server.Infrastructure.Messaging;
 using Coderr.Server.ReportAnalyzer.Inbound.Commands;
diff --git a/src/Server/Coderr.Server.Web/Properties/PublishProfiles/FolderProfile.pubxml b/src/Server/Coderr.Server.Web/Properties/PublishProfiles/FolderProfile.pubxml
@@ -11,9 +11,9 @@ by editing this MSBuild file. In order to learn more about this please visit htt
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <SiteUrlToLaunchAfterPublish />
     <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
+    <ExcludeApp_Data>True</ExcludeApp_Data>
     <ProjectGuid>c3505b24-8213-45c1-baae-73aaa4b75955</ProjectGuid>
     <publishUrl>bin\Release\PublishOutput</publishUrl>
-    <DeleteExistingFiles>False</DeleteExistingFiles>
+    <DeleteExistingFiles>true</DeleteExistingFiles>
   </PropertyGroup>
 </Project>
diff --git a/src/Server/Coderr.Server.Web/Startup.cs b/src/Server/Coderr.Server.Web/Startup.cs
@@ -1,13 +1,19 @@
 ﻿using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using System.Security.Claims;
 using System.Threading.Tasks;
+using Coderr.Client;
+using Coderr.Client.AspNetCore.Mvc;
+using Coderr.Client.ContextCollections;
+using Coderr.Client.Contracts;
 using Coderr.Server.Abstractions.Boot;
 using Coderr.Server.Abstractions.Config;
 using Coderr.Server.Abstractions.Security;
+using Coderr.Server.App.Core.Reports.Config;
 using Coderr.Server.Infrastructure;
+using Coderr.Server.Infrastructure.Configuration;
 using Coderr.Server.Infrastructure.Configuration.Database;
 using Coderr.Server.Infrastructure.Messaging;
 using Coderr.Server.SqlServer;
@@ -21,6 +27,7 @@
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SpaServices.Webpack;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -61,13 +68,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env,
             IApplicationLifetime applicationLifetime)
         {
             applicationLifetime.ApplicationStopping.Register(OnShutdown);
+            ConfigureCoderr(app);
 
             if (env.IsDevelopment())
             {
                 app.UseDeveloperExceptionPage();
                 app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
                 {
-                    HotModuleReplacement = true,
+                    HotModuleReplacement = true
                 });
             }
 
@@ -80,7 +88,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env,
                     routes.MapRoute(
                         "areas",
                         "{area:exists}/{controller=Setup}/{action=Index}/{id?}",
-                        new {area = "Installation"}
+                        new { area = "Installation" }
                     );
 
                 routes.MapRoute("default", "{controller=Home}/{action=Index}/{id?}");
@@ -106,7 +114,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env,
 
         public void ConfigureServices(IServiceCollection services)
         {
-            services.AddMvc(options => { options.Filters.Add<InstallAuthorizationFilter>(); })
+            services.AddMvc(options =>
+                {
+                    AddCoderrToMvc(options);
+                    options.Filters.Add<InstallAuthorizationFilter>();
+                })
                 .AddJsonOptions(jsonOptions =>
                 {
                     jsonOptions.SerializerSettings.ContractResolver = new IncludeNonPublicMembersContractResolver();
@@ -145,14 +157,55 @@ public void ConfigureServices(IServiceCollection services)
             _moduleStarter.Configure(configContext);
         }
 
-        private IServiceProvider GetLazyLoadedServiceProvider()
+        private void AddCoderrToMvc(MvcOptions options)
         {
-            if (_serviceProvider == null)
-                throw new InvalidOperationException("It's not built yet.");
-
-            return _serviceProvider;
+            options.CatchMvcExceptions();
         }
 
+        private void ConfigureCoderr(IApplicationBuilder app)
+        {
+            var url = new Uri("https://report.coderr.io/");
+            Err.Configuration.Credentials(url,
+                "2b3002d3ab3e4a57ad45cff2210221ab",
+                "f381a5c9797f49bd8a3238b892d02806");
+            Err.Configuration.ThrowExceptions = false;
+            app.CatchOwinExceptions();
+
+            CoderrConfigSection config;
+
+            try
+            {
+                var dbStore = new DatabaseStore(() => OpenConnection(CoderrClaims.SystemPrincipal));
+                config = dbStore.Load<CoderrConfigSection>();
+                if (config == null)
+                    return;
+            }
+            catch (SqlException)
+            {
+                // We have not yet configured coderr. 
+                return;
+            }
+            
+
+            // partitions allow us to see the number of affected installations
+            Err.Configuration.AddPartition(x => x.AddPartition("InstallationId", config.InstallationId));
+
+            if (string.IsNullOrWhiteSpace(config.ContactEmail)) 
+                return;
+
+            // Allows us to notify you once the error is corrected.
+            Err.Configuration.ReportPreProcessor = report =>
+            {
+                if (string.IsNullOrWhiteSpace(config.ContactEmail))
+                    return;
+
+                var collection = CollectionBuilder.Feedback(config.ContactEmail, null);
+                var collections = new List<ContextCollectionDTO>(report.ContextCollections.Length + 1);
+                collections.AddRange(report.ContextCollections);
+                collections.Add(collection);
+            };
+        }
+        
         private Task HandleAuthenticationFailure(RedirectContext<CookieAuthenticationOptions> ctx)
         {
             if (ctx.Request.GetDisplayUrl().Contains("/api/"))
diff --git a/src/Server/Coderr.Server.Web/appsettings.Publish.json b/src/Server/Coderr.Server.Web/appsettings.Publish.json
@@ -0,0 +1,22 @@
+﻿{
+  "Installation": {
+    "IsConfigured":  false,
+    "Password":  "changeThis" 
+  } ,
+  "ConnectionStrings": {
+    "Db": "Data Source=.;Initial Catalog=Coderr;Integrated Security=True;Connect Timeout=15;"
+  },
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Warning"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Warning"
+      }
+    }
+  }
+}
diff --git a/src/Server/Coderr.Server.Web/log4net.config b/src/Server/Coderr.Server.Web/log4net.config
@@ -3,7 +3,7 @@
 <log4net>
 
   <appender name="StandardAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="D:\logs\Coderr.Web.log" />
+    <file value="c:\logs\Coderr.Web.log" />
     <appendToFile value="true" />
     <rollingStyle value="Date" />
     <PreserveLogFileNameExtension value="true" />
@@ -17,7 +17,7 @@
     </layout>
   </appender>
   <appender name="ReportAnalyzerAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="D:\logs\Coderr.ReportAnalyzer.log" />
+    <file value="c:\logs\Coderr.ReportAnalyzer.log" />
     <appendToFile value="true" />
     <rollingStyle value="Date" />
     <PreserveLogFileNameExtension value="true" />
@@ -33,7 +33,7 @@
   </appender>
 
   <appender name="ErrorAppender" type="log4net.Appender.RollingFileAppender">
-    <file value="d:\logs\Coderr.Errors.log" />
+    <file value="c:\logs\Coderr.Errors.log" />
     <appendToFile value="true" />
     <rollingStyle value="Date" />
     <PreserveLogFileNameExtension value="true" />
diff --git a/src/Server/Coderr.Server.Web/log4net.production.config b/src/Server/Coderr.Server.Web/log4net.production.config
diff --git a/src/Server/Coderr.Server.Web/prepare_publish.cmd b/src/Server/Coderr.Server.Web/prepare_publish.cmd
@@ -0,0 +1,21 @@
+IF EXIST "bin\Release\PublishOutput\appsettings.Development.json" (
+  del /q bin\Release\PublishOutput\appsettings.json
+  del /q bin\Release\PublishOutput\appsettings.Development.json
+  move bin\Release\PublishOutput\appsettings.Publish.json bin\Release\PublishOutput\appsettings.json
+)
+
+del /q bin\Release\PublishOutput\log4net.production.config
+del /q bin\Release\PublishOutput\log4net.test.config
+
+rmdir /q /s bin\Release\PublishOutput\de
+rmdir /q /s bin\Release\PublishOutput\es
+rmdir /q /s bin\Release\PublishOutput\fr
+rmdir /q /s bin\Release\PublishOutput\it
+rmdir /q /s bin\Release\PublishOutput\ja
+rmdir /q /s bin\Release\PublishOutput\ko
+rmdir /q /s bin\Release\PublishOutput\ru
+rmdir /q /s bin\Release\PublishOutput\zh-Hans
+rmdir /q /s bin\Release\PublishOutput\zh-Hant
+
+pause
+
diff --git a/src/Server/Coderr.Server.Web/webpack.output.json b/src/Server/Coderr.Server.Web/webpack.output.json
diff --git a/src/Server/Coderr.Server.Web/webpack.prod.output.json b/src/Server/Coderr.Server.Web/webpack.prod.output.json
diff --git a/src/Server/Coderr.Server.Web/webpackbuild-report.json b/src/Server/Coderr.Server.Web/webpackbuild-report.json
diff --git a/src/Server/Coderr.Server.Web/wwwroot/dist/main.js b/src/Server/Coderr.Server.Web/wwwroot/dist/main.js

Original file line number	Diff line number	Diff line change
`@@ -64,14 +64,21 @@ protected virtual string DefaultCreateHashCode(ErrorReportEntity report)`
`64`	`64`	`{`
`65`	`65`	`if (report == null) throw new ArgumentNullException("report");`
`66`	`66`
`67`		`- //TODO: Ta bort radnummers stripparen`
`68`		`- var hashSource = report.Exception.FullName + "\r\n";`
`69`		`- hashSource += StripLineNumbers(report.Exception.StackTrace ?? "");`
	`67`	`+`
	`68`	`+ var hashSource = $"{report.Exception.FullName ?? report.Exception.Name}\r\n";`
	`69`	`+`
	`70`	`+ // the client libraries can by themselves specify how we should identify`
	`71`	`+ // unqiue incidents. We then use that identifier in combination with the exception name.`
	`72`	`+ var collection = report.ContextCollections.FirstOrDefault(x => x.Name == "CoderrData");`
	`73`	`+ if (collection != null && collection.Properties.TryGetValue("HashSource", out var reportHashSource))`
	`74`	`+ hashSource += reportHashSource;`
	`75`	`+ else`
	`76`	`+ hashSource += StripLineNumbers(report.Exception.StackTrace ?? "");`
`70`	`77`
`71`	`78`	`var hash = 23;`
`72`	`79`	`foreach (var c in hashSource)`
`73`	`80`	`{`
`74`		`- hash = hash*31 + c;`
	`81`	`+ hash = hash * 31 + c;`
`75`	`82`	`}`
`76`	`83`	`return hash.ToString("X");`
`77`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public async Task<ErrorReportEntity> GetAsync(int id)`
`65`	`65`	`report.Add(collection);`
`66`	`66`	`}`
`67`	`67`
`68`		`- properties.Add(reader.GetString(1), reader.GetString(2));`
	`68`	`+ properties[reader.GetString(1)] = reader.GetString(2);`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`// When the last property is in a new collection`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@`
`21`	`21`	`</div>`
`22`	`22`	`}`
`23`	`23`	`@Html.Raw(ViewBag.PrevStep)`
	`24`	`+ <a href="~/" class="btn btn-primary">I've restarted the pool, let's begin!</a>`
`24`	`25`	`</div>`
`25`	`26`	`</div>`