diff --git a/src/common/cluster/cluster.ts b/src/common/cluster/cluster.ts index 561074a030..cdadd4d3b4 100644 --- a/src/common/cluster/cluster.ts +++ b/src/common/cluster/cluster.ts @@ -379,7 +379,11 @@ export class Cluster implements ClusterModel, ClusterState { /** * @internal */ - @action disconnect() { + @action disconnect(): void { + if (this.disconnected) { + return void logger.debug("[CLUSTER]: already disconnected", { id: this.id }); + } + logger.info(`[CLUSTER]: disconnecting`, { id: this.id }); this.eventsDisposer(); this.contextHandler?.stopServer(); diff --git a/src/common/utils/__tests__/formatDuration.test.ts b/src/common/utils/__tests__/formatDuration.test.ts index a10818ab2b..3c42db9060 100644 --- a/src/common/utils/__tests__/formatDuration.test.ts +++ b/src/common/utils/__tests__/formatDuration.test.ts @@ -55,7 +55,7 @@ describe("human format durations", () => { }); test("durations less than 8 years returns years and days", () => { - const timeValue = Date.now() - new Date(moment().subtract(2, "years").subtract(5, "days").subtract(2, "hours").toDate()).getTime(); + const timeValue = new Date(2020, 0, 10, 12, 0, 0, 0).getTime() - new Date(2018, 0, 4, 12, 0, 0, 0).getTime(); const res = formatDuration(timeValue); diff --git a/src/renderer/components/+preferences/editor.tsx b/src/renderer/components/+preferences/editor.tsx index 2f3e03fff5..fe1f4ca602 100644 --- a/src/renderer/components/+preferences/editor.tsx +++ b/src/renderer/components/+preferences/editor.tsx @@ -85,7 +85,6 @@ export const Editor = observer(() => { editorConfiguration.fontFamily = value} />