Browse Source

Fixed the first bugs.

pull/303/head
Sebastian 8 years ago
parent
commit
b322e63308
  1. 2
      Dockerfile
  2. 2
      libs/Dockerfile
  3. 5
      src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs
  4. 28
      src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerProvider.cs
  5. 2
      src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  6. 2
      src/Squidex/Dockerfile
  7. 9
      src/Squidex/Program.cs
  8. 6
      src/Squidex/WebStartup.cs

2
Dockerfile

@ -33,7 +33,7 @@ RUN dotnet publish src/Squidex/Squidex.csproj --output /out/ --configuration Rel
# #
# Stage 2, Build runtime # Stage 2, Build runtime
# #
FROM microsoft/aspnetcore:2.0.3-jessie FROM microsoft/dotnet:2.1.0-aspnetcore-runtime
# Default AspNetCore directory # Default AspNetCore directory
WORKDIR /app WORKDIR /app

2
libs/Dockerfile

@ -1,4 +1,4 @@
FROM microsoft/aspnetcore-build:2.0.3-jessie FROM microsoft/dotnet:2.1-sdk
# Install runtime dependencies # Install runtime dependencies
RUN apt-get update \ RUN apt-get update \

5
src/Squidex.Infrastructure/Assets/ImageSharp/ImageSharpAssetThumbnailGenerator.cs

@ -10,6 +10,7 @@ using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using SixLabors.ImageSharp; using SixLabors.ImageSharp;
using SixLabors.ImageSharp.Processing; using SixLabors.ImageSharp.Processing;
using SixLabors.ImageSharp.Processing.Transforms;
using SixLabors.Primitives; using SixLabors.Primitives;
namespace Squidex.Infrastructure.Assets.ImageSharp namespace Squidex.Infrastructure.Assets.ImageSharp
@ -18,8 +19,8 @@ namespace Squidex.Infrastructure.Assets.ImageSharp
{ {
public ImageSharpAssetThumbnailGenerator() public ImageSharpAssetThumbnailGenerator()
{ {
Configuration.Default.AddImageFormat(ImageFormats.Jpeg); Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Jpeg);
Configuration.Default.AddImageFormat(ImageFormats.Png); Configuration.Default.ImageFormatsManager.AddImageFormat(ImageFormats.Png);
} }
public Task CreateThumbnailAsync(Stream source, Stream destination, int? width, int? height, string mode) public Task CreateThumbnailAsync(Stream source, Stream destination, int? width, int? height, string mode)

28
src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerProvider.cs

@ -5,24 +5,42 @@
// All rights reserved. Licensed under the MIT license. // All rights reserved. Licensed under the MIT license.
// ========================================================================== // ==========================================================================
using System;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Logging.Abstractions;
namespace Squidex.Infrastructure.Log.Adapter namespace Squidex.Infrastructure.Log.Adapter
{ {
public class SemanticLogLoggerProvider : ILoggerProvider public class SemanticLogLoggerProvider : ILoggerProvider
{ {
private readonly ISemanticLog semanticLog; private readonly IServiceProvider services;
private ISemanticLog log;
public SemanticLogLoggerProvider(ISemanticLog semanticLog) public SemanticLogLoggerProvider(IServiceProvider services)
{ {
Guard.NotNull(semanticLog, nameof(semanticLog)); Guard.NotNull(services, nameof(services));
this.semanticLog = semanticLog; this.services = services;
}
internal SemanticLogLoggerProvider(ISemanticLog log)
{
this.log = log;
} }
public ILogger CreateLogger(string categoryName) public ILogger CreateLogger(string categoryName)
{ {
return new SemanticLogLogger(semanticLog.CreateScope(writer => if (log == null)
{
log = services.GetService(typeof(ISemanticLog)) as ISemanticLog;
}
if (log == null)
{
return NullLogger.Instance;
}
return new SemanticLogLogger(log.CreateScope(writer =>
{ {
writer.WriteProperty("category", categoryName); writer.WriteProperty("category", categoryName);
})); }));

2
src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -16,7 +16,7 @@
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NodaTime" Version="2.3.0" /> <PackageReference Include="NodaTime" Version="2.3.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" /> <PackageReference Include="RefactoringEssentials" Version="5.6.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0001" /> <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0004" />
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" /> <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
<PackageReference Include="System.Collections.Immutable" Version="1.4.0" /> <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
<PackageReference Include="System.Linq" Version="4.3.0" /> <PackageReference Include="System.Linq" Version="4.3.0" />

2
src/Squidex/Dockerfile

@ -1,4 +1,4 @@
FROM microsoft/aspnetcore:2.0.3-jessie FROM microsoft/dotnet:2.1.0-aspnetcore-runtime
WORKDIR /app WORKDIR /app

9
src/Squidex/Program.cs

@ -6,6 +6,7 @@
// ========================================================================== // ==========================================================================
using System.IO; using System.IO;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -20,6 +21,10 @@ namespace Squidex
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
BuildWebHost(args).Run();
}
public static IWebHost BuildWebHost(string[] args) =>
new WebHostBuilder() new WebHostBuilder()
.UseKestrel(k => { k.AddServerHeader = false; }) .UseKestrel(k => { k.AddServerHeader = false; })
.UseContentRoot(Directory.GetCurrentDirectory()) .UseContentRoot(Directory.GetCurrentDirectory())
@ -42,8 +47,6 @@ namespace Squidex
builder.AddCommandLine(args); builder.AddCommandLine(args);
}) })
.Build() .Build();
.Run();
}
} }
} }

6
src/Squidex/WebStartup.cs

@ -21,7 +21,7 @@ using Squidex.Config.Web;
namespace Squidex namespace Squidex
{ {
public sealed class WebStartup : IStartup public sealed class WebStartup
{ {
private readonly IConfiguration configuration; private readonly IConfiguration configuration;
@ -30,13 +30,11 @@ namespace Squidex
this.configuration = configuration; this.configuration = configuration;
} }
public IServiceProvider ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.AddOrleansSilo(); services.AddOrleansSilo();
services.AddOrleansClient(); services.AddOrleansClient();
services.AddAppServices(configuration); services.AddAppServices(configuration);
return services.BuildServiceProvider();
} }
public void Configure(IApplicationBuilder app) public void Configure(IApplicationBuilder app)

Loading…
Cancel
Save