3wordchant
/
oasis
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #388 from christianbundy/fix-config 

Fix config bug
This commit is contained in:
Nick Wynja 2020-04-03 16:49:26 -04:00 committed by GitHub
parent a2d6b59703 cc36f03bb1
commit 6353286f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssb.js
View File

@ -57,7 +57,7 @@ const rawConnect = (options) =>
let handle;
const createConnection = (config) => {
const createConnection = (customConfig) => {
handle = new Promise((resolve) => {
rawConnect({ remote })
.then((ssb) => {
@ -80,11 +80,15 @@ const createConnection = (config) => {
log("Connection attempts to existing Scuttlebutt services failed");
log("Starting Scuttlebutt service");
const server = flotilla(config);
server(config);
// Start with the default SSB-Config object.
const server = flotilla(ssbConfig);
// Adjust with `customConfig`, which declares further preferences.
server(customConfig);
const inProgress = {};
const maxHops = lodash.get(
config,
ssbConfig,
"friends.hops",
lodash.get(ssbConfig, "friends.hops", 0)
);