Skip to content
Snippets Groups Projects
Commit 06b98d14 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2020-05' into 'master' 

Sprint/2020-05

See merge request coscine/cs/apicommons!27
parents 53c0ccb1 533e0687
No related branches found
No related tags found
1 merge request!27Sprint/2020-05
Hide whitespace changes
Inline Side-by-side
Showing
with 44 additions and 42 deletions
src/ApiCommons.Tests/ApiCommons.Tests.csproj
+ 7
− 6
View file @ 06b98d14
......@@ -40,14 +40,14 @@
<Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
<HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
</Reference>
<Reference Include="Coscine.Configuration, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.4.0\lib\net461\Coscine.Configuration.dll</HintPath>
<Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference>
<Reference Include="Coscine.Database, Version=1.16.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.16.0\lib\net461\Coscine.Database.dll</HintPath>
<Reference Include="Coscine.Database, Version=1.17.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.17.0\lib\net461\Coscine.Database.dll</HintPath>
</Reference>
<Reference Include="Coscine.Logging, Version=1.0.1.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.0.1\lib\net461\Coscine.Logging.dll</HintPath>
<Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
......@@ -104,6 +104,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
src/ApiCommons.Tests/ApiCommonsTests.cs
+ 1
− 1
View file @ 06b98d14
......@@ -11,7 +11,7 @@ namespace ApiCommons.Tests
[Test]
public void SelfInstanceLoggingTest()
{
CoscineLogger.SetConfig();
CoscineLoggerConfiguration.SetConfig();
var logger = LogManager.GetCurrentClassLogger();
}
......
src/ApiCommons.Tests/Properties/AssemblyInfo.cs
+ 3
− 3
View file @ 06b98d14
......@@ -9,8 +9,8 @@ using System.Reflection;
[assembly: AssemblyDescription("ApiCommons.Tests is a part of the CoScInE group.")]
[assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
[assembly: AssemblyProduct("ApiCommons.Tests")]
[assembly: AssemblyVersion("1.6.0")]
[assembly: AssemblyFileVersion("1.6.0")]
[assembly: AssemblyInformationalVersion("1.6.0-topic-670-apiref0006")]
[assembly: AssemblyVersion("1.7.0")]
[assembly: AssemblyFileVersion("1.7.0")]
[assembly: AssemblyInformationalVersion("1.7.0-sprint-2020-05-0008")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/ApiCommons.Tests/app.config
+ 4
− 0
View file @ 06b98d14
......@@ -30,6 +30,10 @@
<assemblyIdentity name="Microsoft.Extensions.Options" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Coscine.Configuration" publicKeyToken="ce3d7a32d7dc1e5a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
\ No newline at end of file
src/ApiCommons.Tests/packages.config
+ 3
− 3
View file @ 06b98d14
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Consul" version="0.7.2.6" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net461" />
<package id="Coscine.Database" version="1.16.0" targetFramework="net461" />
<package id="Coscine.Logging" version="1.0.1" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database" version="1.17.0" targetFramework="net461" />
<package id="Coscine.Logging" version="1.1.0" targetFramework="net461" />
<package id="EntityFramework" version="6.2.0" targetFramework="net461" />
<package id="linq2db" version="2.6.4" targetFramework="net461" />
<package id="linq2db.SqlServer" version="2.6.4" targetFramework="net461" />
......
src/ApiCommons/AbstractProgram.cs
+ 1
− 1
View file @ 06b98d14
......@@ -23,7 +23,7 @@ namespace Coscine.ApiCommons
startup.SetBasePath(configurator.ApplicationInformation);
// Load NLog Configuration
CoscineLogger.SetConfig();
CoscineLoggerConfiguration.SetConfig();
var logger = LogManager.GetCurrentClassLogger();
try
......
src/ApiCommons/ApiCommons.csproj
+ 6
− 6
View file @ 06b98d14
......@@ -48,14 +48,14 @@
<Reference Include="Consul, Version=0.7.2.6, Culture=neutral, PublicKeyToken=20a6ad9a81df1d95, processorArchitecture=MSIL">
<HintPath>..\packages\Consul.0.7.2.6\lib\net45\Consul.dll</HintPath>
</Reference>
<Reference Include="Coscine.Configuration, Version=1.4.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.4.0\lib\net461\Coscine.Configuration.dll</HintPath>
<Reference Include="Coscine.Configuration, Version=1.5.0.0, Culture=neutral, PublicKeyToken=ce3d7a32d7dc1e5a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Configuration.1.5.0\lib\net461\Coscine.Configuration.dll</HintPath>
</Reference>
<Reference Include="Coscine.Database, Version=1.16.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.16.0\lib\net461\Coscine.Database.dll</HintPath>
<Reference Include="Coscine.Database, Version=1.17.0.0, Culture=neutral, PublicKeyToken=767d77427707b70a, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Database.1.17.0\lib\net461\Coscine.Database.dll</HintPath>
</Reference>
<Reference Include="Coscine.Logging, Version=1.0.1.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.0.1\lib\net461\Coscine.Logging.dll</HintPath>
<Reference Include="Coscine.Logging, Version=1.1.0.0, Culture=neutral, PublicKeyToken=e1ed402bc3f6525e, processorArchitecture=MSIL">
<HintPath>..\packages\Coscine.Logging.1.1.0\lib\net461\Coscine.Logging.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
......
src/ApiCommons/Middleware/LoggingMiddleware.cs
+ 8
− 15
View file @ 06b98d14
......@@ -40,7 +40,7 @@ namespace Coscine.ApiCommons.Middleware
Stream originalRequestBody = context.Request.Body;
Stream originalResponseBody = context.Response.Body;
var debugLevelIsActive = CoscineLogger.LogLevelIsActivated(LogType.Debug);
var debugLevelIsActive = CoscineLoggerConfiguration.IsLogLevelActivated(LogType.Debug);
if (debugLevelIsActive)
{
......@@ -56,7 +56,7 @@ namespace Coscine.ApiCommons.Middleware
_uri = $"{context.Request.Scheme}://{context.Request.Host}{context.Request.Path}{context.Request.QueryString}";
_request = $"Uri: {_uri} Method: {context.Request.Method}";
CoscineLogger.SetUri(_uri);
CoscineLoggerMetadata.SetUri(_uri);
// Get the User Id
var authorization = context.Request.Headers["Authorization"].ToArray();
......@@ -76,23 +76,16 @@ namespace Coscine.ApiCommons.Middleware
var userClaim = (from claimObj in claims
where claimObj.Type == "UserId"
select claimObj).First();
CoscineLogger.SetUserId(userClaim.Value);
CoscineLoggerMetadata.SetUserId(userClaim.Value);
}
// Get the corrolation Id
context.Request.Headers.TryGetValue("X-Coscine-Logging-CorrelationId", out StringValues corrolationid);
if (corrolationid.Count == 1)
context.Request.Headers.TryGetValue("X-Coscine-Logging-CorrelationId", out StringValues clientCorrolationId);
if (clientCorrolationId.Count == 1)
{
CoscineLogger.SetCorrolationId(corrolationid.ToString());
CoscineLoggerMetadata.SetClientCorrolationId(clientCorrolationId.ToString());
}
else
{
CoscineLogger.SetCorrolationId();
}
// Logging for Analytics
_coscineLogger.Log(LogType.Analytics, _request);
CoscineLoggerMetadata.SetCorrolationId();
/*******************************************
* preparation of the logging process
......@@ -136,7 +129,7 @@ namespace Coscine.ApiCommons.Middleware
******************************************/
_statusCode = $"{context.Response.StatusCode}";
CoscineLogger.SetStatus(_statusCode);
CoscineLoggerMetadata.SetStatus(_statusCode);
// log every message on high that has a non 200-399 StatusCode
if (context.Response.StatusCode < StatusCodes.Status200OK || context.Response.StatusCode >= StatusCodes.Status400BadRequest)
......
src/ApiCommons/Properties/AssemblyInfo.cs
+ 3
− 3
View file @ 06b98d14
......@@ -9,8 +9,8 @@ using System.Reflection;
[assembly: AssemblyDescription("ApiCommons is a part of the CoScInE group.")]
[assembly: AssemblyCompany("IT Center, RWTH Aachen University")]
[assembly: AssemblyProduct("ApiCommons")]
[assembly: AssemblyVersion("1.6.0")]
[assembly: AssemblyFileVersion("1.6.0")]
[assembly: AssemblyInformationalVersion("1.6.0-topic-670-apiref0006")]
[assembly: AssemblyVersion("1.7.0")]
[assembly: AssemblyFileVersion("1.7.0")]
[assembly: AssemblyInformationalVersion("1.7.0-sprint-2020-05-0008")]
[assembly: AssemblyCopyright("2020 IT Center, RWTH Aachen University")]
src/ApiCommons/app.config
+ 5
− 1
View file @ 06b98d14
......@@ -105,7 +105,11 @@
<dependentAssembly>
<assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.5.0.0" newVersion="5.5.0.0" />
</dependentAssembly> </assemblyBinding>
</dependentAssembly> <dependentAssembly>
<assemblyIdentity name="Coscine.Configuration" publicKeyToken="ce3d7a32d7dc1e5a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.5.0.0" newVersion="1.5.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<entityFramework>
<defaultConnectionFactory type="System.Data.Entity.Infrastructure.LocalDbConnectionFactory, EntityFramework">
......
src/ApiCommons/packages.config
+ 3
− 3
View file @ 06b98d14
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Consul" version="0.7.2.6" targetFramework="net472" />
<package id="Coscine.Configuration" version="1.4.0" targetFramework="net472" />
<package id="Coscine.Database" version="1.16.0" targetFramework="net461" />
<package id="Coscine.Logging" version="1.0.1" targetFramework="net461" />
<package id="Coscine.Configuration" version="1.5.0" targetFramework="net461" />
<package id="Coscine.Database" version="1.17.0" targetFramework="net461" />
<package id="Coscine.Logging" version="1.1.0" targetFramework="net461" />
<package id="EntityFramework" version="6.2.0" targetFramework="net472" />
<package id="linq2db" version="2.6.4" targetFramework="net472" />
<package id="linq2db.SqlServer" version="2.6.4" targetFramework="net472" />
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment