From 6d4d99c15cfb903879a1b4dbeba27c6fc22cbbf3 Mon Sep 17 00:00:00 2001 From: Matias Date: Fri, 5 Jul 2019 14:35:48 -0300 Subject: [PATCH 1/3] Don't remove the clone from the ecosystem --- .../schema/mutations/RemoveCloneMutation.js | 22 ------------------- 1 file changed, 22 deletions(-) diff --git a/server/src/schema/mutations/RemoveCloneMutation.js b/server/src/schema/mutations/RemoveCloneMutation.js index a9f7dd8a0..38813d3eb 100644 --- a/server/src/schema/mutations/RemoveCloneMutation.js +++ b/server/src/schema/mutations/RemoveCloneMutation.js @@ -42,28 +42,6 @@ const resolve = async (parent, { id }, context) => { logger.debug('removeClone -> Removing Clone from Kubernates.') await removeKuberneteClone(clone.id) - if (clone.botType === Trading) { - let productCodeName - if (clone.mode === LIVE) { - productCodeName = 'Live Trading History' - } - if (clone.mode === COMPETITION) { - productCodeName = 'Competition Trading History' - } - if (clone.mode === BACKTEST) { - productCodeName = 'Backtest Trading History' - } - - let newEcosystemBot = { - devTeam: clone.teamSlug, - codeName: clone.botSlug, - cloneId: clone.id, - productCodeName - } - - await removeBotMutation(context.authorization, newEcosystemBot) - } - const query = { _id: id, authId: context.userId From 7125024f3af9b12eba96a41dfd43fc91bfb04bfb Mon Sep 17 00:00:00 2001 From: Matias Date: Wed, 10 Jul 2019 08:38:56 -0300 Subject: [PATCH 2/3] New client version --- client/package.json | 2 +- client/src/views/Clone/History/index.js | 3 ++- client/src/views/Clone/List/ListClones.js | 1 + client/src/views/Clone/List/index.js | 3 ++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/client/package.json b/client/package.json index 27a4499c0..512ac872c 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@superalgos/operations-client", - "version": "0.0.38", + "version": "0.0.41", "description": "Superalgos Operations client-side web app", "author": "Superalgos, ltd.", "license": "Apache-2.0", diff --git a/client/src/views/Clone/History/index.js b/client/src/views/Clone/History/index.js index 170c34094..e1bc38bd8 100644 --- a/client/src/views/Clone/History/index.js +++ b/client/src/views/Clone/History/index.js @@ -48,11 +48,12 @@ class HistoryClones extends Component { ) } else if (data.error) { + console.log('Error Listing clones.', data.error) return ( ) diff --git a/client/src/views/Clone/List/ListClones.js b/client/src/views/Clone/List/ListClones.js index 18e521e02..730ebf7b3 100644 --- a/client/src/views/Clone/List/ListClones.js +++ b/client/src/views/Clone/List/ListClones.js @@ -209,6 +209,7 @@ class ListClones extends Component { open={this.state.isLogsDialogOpen} onClose={this.handleLogsDialogClose} aria-labelledby="logs-dialog-title" + fullScreen > Last clone logs diff --git a/client/src/views/Clone/List/index.js b/client/src/views/Clone/List/index.js index 4cf60b48b..c94f56cc5 100644 --- a/client/src/views/Clone/List/index.js +++ b/client/src/views/Clone/List/index.js @@ -48,11 +48,12 @@ class BrowseClones extends Component { ) } else if (data.error) { + console.log('Error Listing clones.', data.error) return ( ) From 29c548fc2fbd94fbdd9a3764c5aa549e9f471f89 Mon Sep 17 00:00:00 2001 From: Matias Date: Wed, 10 Jul 2019 08:40:05 -0300 Subject: [PATCH 3/3] Improving logs view --- server/src/kubernetes/createClone.js | 14 +++++++------- server/src/kubernetes/getClonePodLogs.js | 2 +- test/cloneAdminTest.js | 16 ++++++++-------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/server/src/kubernetes/createClone.js b/server/src/kubernetes/createClone.js index f6f780dfd..202c20e45 100644 --- a/server/src/kubernetes/createClone.js +++ b/server/src/kubernetes/createClone.js @@ -32,19 +32,19 @@ const createClone = async (clone) => { 'name': 'HOST_STORAGE', 'value': 'localStorage' }) - // TODO Pending setting private bots - // env.push({ - // 'name': 'HOST_ACCESS_KEY', - // 'value': clone.host.accessKey - // }) - - if(clone.authorization){ + if (clone.authorization) { env.push({ 'name': 'AUTHORIZATION', 'value': clone.authorization }) } + if (JSON.parse(process.env.FULL_LOG)) { + env.push({ + 'name': 'FULL_LOG', + 'value': process.env.FULL_LOG + }) + } logger.debug('createClone General Financial Being Configuration.') env.push({ 'name': 'DEV_TEAM', diff --git a/server/src/kubernetes/getClonePodLogs.js b/server/src/kubernetes/getClonePodLogs.js index b37ee34dd..e2d95f2a5 100644 --- a/server/src/kubernetes/getClonePodLogs.js +++ b/server/src/kubernetes/getClonePodLogs.js @@ -20,7 +20,7 @@ const getClonePodLogs = async (cloneName) => { let queryLogs = { 'qs': { - 'tailLines': '20' + 'tailLines': '300' } } if(pod.body.items[0] !== undefined){ diff --git a/test/cloneAdminTest.js b/test/cloneAdminTest.js index 1df9f4770..777c5475f 100644 --- a/test/cloneAdminTest.js +++ b/test/cloneAdminTest.js @@ -14,7 +14,7 @@ describe('Admin clones Clones', function () { assert.isOk('everything', 'everything is ok') }) // it('Add COSS Live Indicator Clones', async function () { - // this.timeout(300000) + // this.timeout(1000000) // var error // var clones = activeCloneList("Coss") // try { @@ -28,7 +28,7 @@ describe('Admin clones Clones', function () { // assert.equal(error, undefined) // }) // it('Add POLONIEX Live Indicator Clones', async function () { - // this.timeout(300000) + // this.timeout(1000000) // var error // var clones = activeCloneList("Poloniex") // try { @@ -43,36 +43,36 @@ describe('Admin clones Clones', function () { // }) describe('Poloniex clones', function () { it('Add Charly', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[0]) await createClone(cloneList[1]) assert.isOk('everything', 'everything is ok') }) it('Add Bruce', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[2]) assert.isOk('everything', 'everything is ok') }) it('Add Olivia', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[3]) await createClone(cloneList[4]) assert.isOk('everything', 'everything is ok') }) it('Add Tom', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[5]) await createClone(cloneList[6]) assert.isOk('everything', 'everything is ok') }) it('Add Chris', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[7]) await createClone(cloneList[8]) assert.isOk('everything', 'everything is ok') }) it('Add Paula', async function () { - this.timeout(3000) + this.timeout(10000) await createClone(cloneList[9]) await createClone(cloneList[10]) assert.isOk('everything', 'everything is ok')