From 33424f1193b5e27bfe59bf3c4e62174d14d99486 Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 19 Mar 2019 18:38:19 +0100 Subject: [PATCH] Fixing merge --- server/src/index.js | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/server/src/index.js b/server/src/index.js index e21f8c5b0..9001d7703 100644 --- a/server/src/index.js +++ b/server/src/index.js @@ -74,10 +74,10 @@ async function run () { 'logs_', process.env.LOGS_API_URL, process.env.LOGS_API_PRESHARED) - const transformedMinersSchema = await createTransformedRemoteSchema( - 'miners_', - process.env.MINERS_API_URL, - process.env.MINERS_PRESHARED) + // const transformedMinersSchema = await createTransformedRemoteSchema( + // 'miners_', + // process.env.MINERS_API_URL, + // process.env.MINERS_PRESHARED) const transformeStrategizerSchema = await createTransformedRemoteSchema( 'strategizer_', process.env.STRATEGIZER_API_URL, @@ -126,7 +126,13 @@ async function run () { if (transformedLogsSchema) { schemas.push(transformedLogsSchema) } - + if (transformeStrategizerSchema) { + schemas.push(transformeStrategizerSchema) + } + if (transformeCockpitSchema) { + schemas.push(transformeCockpitSchema) + } + const schema = mergeSchemas({ schemas, resolvers