mirror of
https://github.com/bitwarden/server.git
synced 2025-02-23 03:01:23 +01:00
cipher revision update. fixed exception handler logging issue. added logger to push service.
This commit is contained in:
parent
cbdc8f355f
commit
fefe541251
@ -49,8 +49,8 @@ namespace Bit.Api.Utilities
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<ExceptionHandlerFilterAttribute>>();
|
var logger = context.HttpContext.RequestServices.GetRequiredService<ILogger<ExceptionHandlerFilterAttribute>>();
|
||||||
logger.LogError(null, exception, exception.Message);
|
logger.LogError(0, exception, exception.Message);
|
||||||
logger.LogError(null, exception, exception.Message);
|
logger.LogError(0, exception, exception.Message);
|
||||||
|
|
||||||
errorModel.Message = "An unhandled server error has occured.";
|
errorModel.Message = "An unhandled server error has occured.";
|
||||||
context.HttpContext.Response.StatusCode = 500;
|
context.HttpContext.Response.StatusCode = 500;
|
||||||
|
@ -31,6 +31,7 @@ namespace Bit.Core.Services
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
cipher.RevisionDate = DateTime.UtcNow;
|
||||||
await _cipherRepository.ReplaceAsync(cipher);
|
await _cipherRepository.ReplaceAsync(cipher);
|
||||||
|
|
||||||
// push
|
// push
|
||||||
|
@ -13,21 +13,25 @@ using Bit.Core.Domains;
|
|||||||
using Bit.Core.Enums;
|
using Bit.Core.Enums;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Bit.Core.Services
|
namespace Bit.Core.Services
|
||||||
{
|
{
|
||||||
public class PushService : IPushService
|
public class PushService : IPushService
|
||||||
{
|
{
|
||||||
private readonly IDeviceRepository _deviceRepository;
|
private readonly IDeviceRepository _deviceRepository;
|
||||||
|
private readonly ILogger<IPushService> _logger;
|
||||||
private GcmServiceBroker _gcmBroker;
|
private GcmServiceBroker _gcmBroker;
|
||||||
private ApnsServiceBroker _apnsBroker;
|
private ApnsServiceBroker _apnsBroker;
|
||||||
|
|
||||||
public PushService(
|
public PushService(
|
||||||
IDeviceRepository deviceRepository,
|
IDeviceRepository deviceRepository,
|
||||||
|
ILogger<IPushService> logger,
|
||||||
IHostingEnvironment hostingEnvironment,
|
IHostingEnvironment hostingEnvironment,
|
||||||
GlobalSettings globalSettings)
|
GlobalSettings globalSettings)
|
||||||
{
|
{
|
||||||
_deviceRepository = deviceRepository;
|
_deviceRepository = deviceRepository;
|
||||||
|
_logger = logger;
|
||||||
|
|
||||||
InitGcmBroker(globalSettings);
|
InitGcmBroker(globalSettings);
|
||||||
InitApnsBroker(globalSettings, hostingEnvironment);
|
InitApnsBroker(globalSettings, hostingEnvironment);
|
||||||
|
Loading…
Reference in New Issue
Block a user