Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-02-18 02:11:22 +01:00
Code Issues Projects Releases Wiki Activity

America/New_York timezone on non-windows

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-27 23:30:53 -04:00
parent 9c90358aa1
commit c31e377f32
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Admin/Jobs/JobsHostedService.cs
View File

@ -1,5 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Core; using Bit.Core;
@ -26,8 +27,13 @@ namespace Bit.Admin.Jobs
public override async Task StartAsync(CancellationToken cancellationToken) public override async Task StartAsync(CancellationToken cancellationToken)
{ {
var timeZone = _globalSettings.SelfHosted ? TimeZoneInfo.Utc : var timeZone = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time"); TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time") :
TimeZoneInfo.FindSystemTimeZoneById("America/New_York");
if(_globalSettings.SelfHosted)
{
timeZone = TimeZoneInfo.Utc;
}
var everyTopOfTheHourTrigger = TriggerBuilder.Create() var everyTopOfTheHourTrigger = TriggerBuilder.Create()
.StartNow() .StartNow()

17
src/Billing/Jobs/JobsHostedService.cs
View File

@ -1,7 +1,9 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Runtime.InteropServices;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Bit.Core;
using Bit.Core.Jobs; using Bit.Core.Jobs;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging;
@ -11,15 +13,26 @@ namespace Bit.Billing.Jobs
{ {
public class JobsHostedService : BaseJobsHostedService public class JobsHostedService : BaseJobsHostedService
{ {
private readonly GlobalSettings _globalSettings;
public JobsHostedService( public JobsHostedService(
GlobalSettings globalSettings,
IServiceProvider serviceProvider, IServiceProvider serviceProvider,
ILogger<JobsHostedService> logger, ILogger<JobsHostedService> logger,
ILogger<JobListener> listenerLogger) ILogger<JobListener> listenerLogger)
: base(serviceProvider, logger, listenerLogger) { } : base(serviceProvider, logger, listenerLogger) {
_globalSettings = globalSettings;
}
public override async Task StartAsync(CancellationToken cancellationToken) public override async Task StartAsync(CancellationToken cancellationToken)
{ {
var timeZone = TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time"); var timeZone = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
TimeZoneInfo.FindSystemTimeZoneById("Eastern Standard Time") :
TimeZoneInfo.FindSystemTimeZoneById("America/New_York");
if(_globalSettings.SelfHosted)
{
timeZone = TimeZoneInfo.Utc;
}
var everyDayAtNinePmTrigger = TriggerBuilder.Create() var everyDayAtNinePmTrigger = TriggerBuilder.Create()
.StartNow() .StartNow()