Browse Source

Code fixes

pull/195/head
Sebastian Stehle 8 years ago
parent
commit
3c80f46d01
  1. 39
      Dockerfile
  2. 5
      src/Squidex.Infrastructure/Tasks/LimitedConcurrencyLevelTaskScheduler.cs
  3. 46
      src/Squidex.Infrastructure/Tasks/SingleThreadedDispatcher.cs
  4. 14
      tests/Squidex.Infrastructure.Tests/Tasks/SingleThreadedDispatcherTests.cs

39
Dockerfile

@ -3,49 +3,12 @@
# #
FROM microsoft/aspnetcore-build:2.0.3-jessie as builder FROM microsoft/aspnetcore-build:2.0.3-jessie as builder
# Install runtime dependencies
RUN apt-get update \
&& apt-get install -y --no-install-recommends ca-certificates bzip2 libfontconfig \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# Install official PhantomJS release
RUN set -x \
&& apt-get update \
&& apt-get install -y --no-install-recommends \
&& mkdir /srv/var \
&& mkdir /tmp/phantomjs \
# Download Phantom JS
&& curl -L https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 | tar -xj --strip-components=1 -C /tmp/phantomjs \
# Copy binaries only
&& mv /tmp/phantomjs/bin/phantomjs /usr/local/bin \
# Create symbol link
# Clean up
&& apt-get autoremove -y \
&& apt-get clean all \
&& rm -rf /tmp/* /var/lib/apt/lists/*
RUN phantomjs --version
COPY src/Squidex/package.json /tmp/package.json
# Install Node packages
RUN cd /tmp && npm install
COPY . . COPY . .
WORKDIR / WORKDIR /
# Build Frontend
RUN cp -a /tmp/node_modules /src/Squidex/ \
&& cd /src/Squidex \
&& npm run test:coverage \
&& npm run build:copy \
&& npm run build
# Test Backend # Test Backend
RUN dotnet restore \ RUN dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \
&& dotnet test tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Read.Tests/Squidex.Domain.Apps.Read.Tests.csproj \
&& dotnet test tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj \ && dotnet test tests/Squidex.Domain.Apps.Write.Tests/Squidex.Domain.Apps.Write.Tests.csproj \

5
src/Squidex.Infrastructure/Tasks/LimitedConcurrencyLevelTaskScheduler.cs

@ -75,7 +75,10 @@ namespace Squidex.Infrastructure.Tasks
TryExecuteTask(item); TryExecuteTask(item);
} }
} }
finally { currentThreadIsProcessingItems = false; } finally
{
currentThreadIsProcessingItems = false;
}
}, null); }, null);
} }

46
src/Squidex.Infrastructure/Tasks/SingleThreadedDispatcher.cs

@ -29,52 +29,6 @@ namespace Squidex.Infrastructure.Tasks
block = new ActionBlock<Func<Task>>(Handle, options); block = new ActionBlock<Func<Task>>(Handle, options);
} }
public Task DispatchAndUnwrapAsync(Func<Task> action)
{
Guard.NotNull(action, nameof(action));
var tcs = new TaskCompletionSource<bool>();
block.SendAsync(async () =>
{
try
{
await action();
tcs.SetResult(true);
}
catch (Exception ex)
{
tcs.SetException(ex);
}
});
return tcs.Task;
}
public Task<T> DispatchAndUnwrapAsync<T>(Func<Task<T>> action)
{
Guard.NotNull(action, nameof(action));
var tcs = new TaskCompletionSource<T>();
block.SendAsync(async () =>
{
try
{
var result = await action();
tcs.SetResult(result);
}
catch (Exception ex)
{
tcs.SetException(ex);
}
});
return tcs.Task;
}
public Task DispatchAsync(Func<Task> action) public Task DispatchAsync(Func<Task> action)
{ {
Guard.NotNull(action, nameof(action)); Guard.NotNull(action, nameof(action));

14
tests/Squidex.Infrastructure.Tests/Tasks/SingleThreadedDispatcherTests.cs

@ -1,10 +1,10 @@
 //========================================================================== // ==========================================================================
// SingleThreadedDispatcherTests.cs // SingleThreadedDispatcherTests.cs
// Squidex Headless CMS // Squidex Headless CMS
//========================================================================== // ==========================================================================
// Copyright (c) Squidex Group // Copyright (c) Squidex Group
// All rights reserved. // All rights reserved.
//========================================================================== // ==========================================================================
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;

Loading…
Cancel
Save