From d125e080a10e8cf5d2cf010d70b59eb5f94f9316 Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Sun, 29 Oct 2017 21:31:26 +0100
Subject: [PATCH] [fix] persistent proxyConf
---
app/lib/dal/fileDAL.ts | 5 +++++
index.ts | 2 +-
server.ts | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/app/lib/dal/fileDAL.ts b/app/lib/dal/fileDAL.ts
index 6281d83fb..3eec9daed 100644
--- a/app/lib/dal/fileDAL.ts
+++ b/app/lib/dal/fileDAL.ts
@@ -15,6 +15,7 @@ import {DBBlock} from "../db/DBBlock"
import {DBMembership} from "./sqliteDAL/MembershipDAL"
import {MerkleDTO} from "../dto/MerkleDTO"
import {CommonConstants} from "../common-libs/constants"
+import { ProxyConf } from '../proxy';
const fs = require('fs')
const path = require('path')
@@ -842,7 +843,11 @@ export class FileDAL {
let conf = ConfDTO.complete(overrideConf || {});
if (!defaultConf) {
const savedConf = await this.confDAL.loadConf();
+ const savedProxyConf = _(savedConf.proxyConf).extend({});
conf = _(savedConf).extend(overrideConf || {});
+ if (overrideConf.proxyConf !== undefined) {} else {
+ conf.proxyConf = _(savedProxyConf).extend({});
+ }
}
if (this.loadConfHook) {
await this.loadConfHook(conf)
diff --git a/index.ts b/index.ts
index 60adec394..ada66317c 100644
--- a/index.ts
+++ b/index.ts
@@ -438,7 +438,7 @@ class Stack {
}
}
-function commandLineConf(program:any, conf:ConfDTO = ConfDTO.mock()) {
+function commandLineConf(program:any, conf:any = {}) {
conf = conf || {};
const cli = {
diff --git a/server.ts b/server.ts
index f91364b26..89772dbf0 100644
--- a/server.ts
+++ b/server.ts
@@ -73,7 +73,7 @@ export class Server extends stream.Duplex implements HookableServer {
TransactionsService:TransactionService
private documentFIFO:GlobalFifoPromise
- constructor(home:string, memoryOnly:boolean, private overrideConf:ConfDTO) {
+ constructor(home:string, memoryOnly:boolean, private overrideConf:any) {
super({ objectMode: true })
this.home = home;
--
GitLab